first commit
Merge branch 'master' of github.com:surzycki/madhatter

Conflicts:
	.gitignore