validation voting block
added email config and heroku
Cookies for event_voted working
Merge pull request #6 from benmaher/cookies

Cookies for event_voted working
Nate's Changes

Updated time inputs and some other styles
fixed merge conflicts
formatting fixes
whatever i did on layouts/application
Including Brad's Changes

Updating style sheets and a lot of the app pages
fixed merge conflicts
fixed merge conflict
Merge branch 'NArnold'

Conflicts:
	app/assets/stylesheets/custom.css
	app/views/event_times/_form.html.erb
	app/views/event_times/new.html.erb
	app/views/events/_details.html.erb
	app/views/events/show.html.erb
	app/views/locations/_form.html.erb
	app/views/locations/new.html.erb
	app/views/votes/_form.html.erb
	app/views/votes/show.html.erb
adding brad's changes
fixing merge conflicts?!

Conflicts:
	app/assets/stylesheets/custom.css
	app/views/event_times/_form.html.erb
	app/views/event_times/new.html.erb
	app/views/events/_details.html.erb
	app/views/events/show.html.erb
	app/views/locations/_form.html.erb
	app/views/locations/new.html.erb
	app/views/votes/_form.html.erb
	app/views/votes/show.html.erb
Merge branch 'master' of https://github.com/nojoek/lets530

merging bondy's and nate's and brad's updates
commiting some changes
Merge branch 'master' of https://github.com/nojoek/lets530

pulling down master branch, should be semi finalized
fixing merge conflicts
adjusted logo sizing
changed production mailer env