saving...
Merge branch 'master' of https://github.com/Charlili/CP3-eindopdracht-2DEV2-groep3

# By Charlotte Vanroelen
# Via Charlotte Vanroelen
* 'master' of https://github.com/Charlili/CP3-eindopdracht-2DEV2-groep3:
  Fixed #28: draggable with jquery instead of jqueryUi. Still chewing on resizable.

Conflicts:
	css/screen.css
	js/script.dist.js.map