changed all the things
Merge branch 'master' of https://github.com/faridonfire/moviebuddy into faridonfire-master

Conflicts:
	app/scripts/controllers/login.js