updates to show.html.erb
Merge branch 'ken'
fixed issues with footer
Merge branch 'seth' of https://github.com/JJasper714/plates into ken
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
Merge branch 'master' of https://github.com/JJasper714/plates into ken
STUFF