K
Merge branch 'master' of github.com:HackathonRome/speedy-gift

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