gitignore
Merge branch 'master' of https://github.com/cmitz/Shoque

Conflicts:
	.gitignore