..
Merge branch 'master' of https://github.com/yboulkaid/IP_Project_Group19

Conflicts:
	index.html
	res/controllers/mainViewController.js