First commit
Merge branch 'master' of github.com:Pinkerton/smak

Conflicts:
	.gitignore