test
Merge branch 'master' of https://github.com/ncosmin2001/angular1

Conflicts:
	app/scripts/controllers/about.js
	app/scripts/controllers/main.js