last changes
Merge branch 'master' of https://github.com/TheRealHaui/ASE_Term1_Mobile_Applications_Team_Project

Conflicts:
	app/controllers/index.js