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

Conflicts:
	app/views/layouts/application.html.erb
	app/views/welcome/friends.html.erb
Frontend