adding homepage changes
Merge branch 'master' of https://github.com/jchansen/cft2013

Conflicts:
	app/views/layouts/application.html.erb
Merge branch 'master' of https://github.com/jchansen/cft2013