init
Merge branch 'master' of https://github.com/brandoncox/kata3

Conflicts:
	.gitignore