Renamed labs folders
Merge branch 'master' into gh-pages

Conflicts:
	Lab1/js/logic.js