flash messages automatically hide
Merge branch 'master' into flash_messages

Conflicts:
	app/views/layouts/application.html.erb
Merge pull request #36 from theFirehoseProject/flash_messages

Automatically disappearing flash messages

Resolved merge conflict, merging.