my commits

city form
Merge branch 'master' of https://github.com/ChrisSmith/KansasBBQueue-

Conflicts:
	index.php