Merge pull request #5 from nojoek/bondy

Bondy
Tagline

Updated CSS and HTML to include tag line under logo
Merge branch 'NArnold'

Conflicts:
	app/views/events/_form.html.erb
	app/views/events/new.html.erb
fixed merge conflicts
formatting including display description only if not blank
hide location and time options if not present in voting
ben's changes on sorting
Merge branch 'master' of https://github.com/nojoek/lets530 into bondy

pulling joe's and justin's changes for the day
fixed jquery to add remove locations on form
added jquery to add/remove times