Tyler's version
Merge branch 'master' of https://github.com/david-brooks/collaborativewriting

Conflicts:
	collaborativewriting