First commit
Merge branch 'master' of github.com:brobo/mumshoppe

Conflicts:
	.gitignore