Merge branch 'master' of https://github.com/zimzat/gay-city-reservations

Conflicts:
	.gitignore