wat
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	db/schema.rb
Adding the ability to save hash tags from your mom.
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	app/views/events/_submit.html.erb