Updates
Merge branch 'master' of https://github.com/amedeiros/badDog2

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