updated!
Merge branch 'goodOne' of https://github.com/jtrinker/eskridgewhite into goodOne

Conflicts:
	app/assets/javascripts/templates/about/subnav.hbs