Updated documentation
Merge branch 'refs/heads/master' into feature-adjust-documentation

Conflicts:
	CONTRIBUTING.md
Merge pull request #2 from TeamOneTickets/feature-adjust-documentation

Updated documentation