prep for heroku and adds PG gem
added vote validation
I did a lot of stuff today
Updated CSS and Layout files

Included Brad's updates to bootswatch and custom: new media queries,
and some button

Updated with new logo
kjkhj
Merge pull request #3 from nojoek/NArnold

N arnold
Merge branch 'master' of https://github.com/nojoek/lets530

merge what nate did
Merge branch 'master' of https://github.com/nojoek/lets530 into bondy

Conflicts:
	app/views/event_times/_form.html.erb
	app/views/events/_details.html.erb
	app/views/events/show.html.erb
	app/views/locations/_form.html.erb
	app/views/votes/show.html.erb

trying to fix merge conflicts