fix all the things
Merge branch 'master' of github.com:nonrational/grabinero

Conflicts:
	views/layout.erb