All an all I'm just another brick in the seed
Merge branch 'master' of https://github.com/steveoro/goggles

Conflicts:
	db/schema.rb

Hoping