niks code
Merge branch 'master' of https://github.com/ewatc/angularjs

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