Initial commit
Merge branch 'master' of https://github.com/chrisjo/hodor

Conflicts:
	README.md
gitignore