no message
Merge branch 'master' of https://github.com/jcburke14/dugong

Conflicts:
	app/views/postings/show.html.erb