Delete Brainstorm.jpeg
Delete Flashcards.jpeg
Delete Flowchart.jpeg
Delete Structure.jpeg
Delete Scans_Whiteboard.zip
Merge branch 'master' of https://github.com/Charlili/CP3-eindopdracht-2DEV2-groep3

* 'master' of https://github.com/Charlili/CP3-eindopdracht-2DEV2-groep3:
  Delete Scans_Whiteboard.zip
  Delete Structure.jpeg
  Delete Flowchart.jpeg
  Delete Flashcards.jpeg
  Delete Brainstorm.jpeg
Merge branch 'develop'

* develop:
  Line class works: create & drag #6
  Gewerkt aan design resolved #2
  Working on the Line Class. Thinking of using the Paper mouse events to trigger the Line creation instead of jquery mouse events.
  Testing Line class.
Changing page structure
Merge branch 'master' into develop

Conflicts:
	Scans_Whiteboard/Flowchart.jpeg
	js/script.dist.js.map