initial commit.
Merge branch 'master' of https://github.com/jabaraster/PetShop_by_Yesod

Conflicts:
	.gitignore