Corrected title
Merge branch 'master' of github.com:youdevise/norman

Conflicts:
	app/index.html