Caroline's changes
Merge branch 'master' of https://github.com/jshthornton/example

Conflicts:
	readme.txt