add new
Merge branch 'master' of github.com:hughgr/Angular

Conflicts:
	app/js/controllers.js
add moduler