Hashtag updates, see email for update
Merge branch 'master' of https://github.com/YEI-jacob-w/CloudMap

Conflicts:
	db/schema.rb