first commit
Merge branch 'master' of https://github.com/simpsonness/first-repo

Conflicts:
	readme.txt