schema change
Merge branch 'master' of https://github.com/bfpg-govhack/govhack-brissy-parks

Conflicts:
	static/Main.js