change from view1,view2 to home,hero url
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/index.html
	app/js/app.js
	app/js/controllers.js
Wstępne dane o postaci