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

Conflicts:
	res/views/dayView.js