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

Conflicts:
	app/index.html
	app/scripts/services/login.js