First commit
Merge branch 'master' of https://github.com/alexefish/calasmash

Conflicts:
	.gitignore
	README.md