ready to go
Merge branch 'master' of github.com:camicano/monsters_app

Conflicts:
	app/views/layouts/application.html.erb
Merge branch 'master' of github.com:camicano/monsters_app

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