Merge branch 'master' into hannah

Conflicts:
	README.md
Merge branch 'hannah' of github.com:trentio/urbanambassadors into hannah
add line delimiter