More work from user 1
Merge branch 'master' of github.com:ianlotto/example

Conflicts:
	readme.txt