update
Merge branch 'master' of https://github.com/stoute/ng_app

Conflicts:
	js/app.js
	ng_app.module