Merge pull request #30 from theFirehoseProject/admin

add admin true or false to users
flash messages automatically hide
Merge pull request #38 from theFirehoseProject/ken-styles

Adjust the styles on the main page
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.
updated spacing and some styles for welcome