BugFix Error
Merge branch 'master' of github.com:chrizzTs/Who-U

Conflicts:
	app/scripts/app.js