semantic -- fixing breaking tests after updating UI
backwardz -- remove protected attribute gem & unnecessary config.*
padding around page
Merge branch 'develop'

Conflicts:
	app/views/layouts/application.html.erb
Merge branch 'develop' into resolve

Conflicts:
	app/views/layouts/application.html.erb
making diff between baseline and installed branches look cleaner
Merge branch 'develop' of https://github.com/conroywhitney/gringotts-client into installed

Conflicts:
	Gemfile
	app/views/layouts/application.html.erb
	config/routes.rb