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

Conflicts:
	concept/SortableLists/Layout.html
	concept/SortableLists/layoutStyle.css
Merge branch 'master' of https://github.com/yboulkaid/IP_Project_Group19