pushing joe's and bondy's changes
Merge branch 'master' of https://github.com/nojoek/lets530 into bondy

Conflicts:
	app/views/layouts/application.html.erb

fixed merge conflicts