aswea
Merge branch 'master' of https://github.com/TeamAlberto/AlbertoApp

Conflicts:
	app/scripts/main.js