step2 finished
Merge branch 'tutorial'

Conflicts:
	app/index.html
	app/js/controllers.js