Kata 1: Initial commit
Merge branch 'master' of github.com:aerosol/katas

Conflicts:
	.gitignore