updates to show.html.erb
Merge branch 'ken'
replaced text in home html new html and show html also some styling change in bootstrap
Merges and junk
Merge branch 'seth'
Merge branch 'ken'

Conflicts:
	app/views/events/show.html.erb
minor event view changes
Seth is going to kill me changes
Seth is going to kill me changes
css for tables