commit from cloud
Merge branch 'master' of github.com:apple-zizit/first-phone

Conflicts:
	app/views/partials/main.html