Adding icons to main page
Merge branch 'master' of github.com:youdevise/norman

Conflicts:
	app/js/controllers.js