Merge pull request #62 from PurpleBooth/added-code-of-conduct

(doc) Added a code of conduct

CODE_OF_CONDUCT.md

@@ -0,0 +1,33 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we 
+pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, 
+submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level 
+of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, 
+race, ethnicity, age, religion, or nationality.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery
+* Personal attacks
+* Trolling or insulting/derogatory comments
+* Public or private harassment
+* Publishing other's private information, such as physical or electronic addresses, without explicit permission
+* Other unethical or unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, 
+issues, and other contributions that are not aligned to this Code of Conduct. By adopting this Code of Conduct, project 
+maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this 
+project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the 
+project team.
+
+This code of conduct applies both within project spaces and in public spaces when an individual is representing the 
+project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting 
+one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0, 
+available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)

CONTRIBUTING.md

@@ -70,6 +70,11 @@ a ticket number.
 * The core team looks at Pull Requests on a fairly regular basis.
 * After reviewing the pull request, the PR will either be merged into master, responded to with some additional needs or changes, or closed depending on the situation. The core team will try and be as responsive as possible. Others may respond to the ticket, but only core team members have write access to the repository.
 
+## Code of Conduct
+
+Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree
+to abide by its terms. For more details see the [CODE_OF_CONDUCT.md](CODE_OF_CONDUCT.md).
+
 # Additional Resources
 
 * [General GitHub documentation](http://help.github.com/)