Clean Up both forms. Everything good but Post
Merge branch 'hannah' of https://github.com/trentio/urbanambassadors into hannah

Conflicts:
	index.html
Fix merge