Merge pull request #1 from SEGroup10/test

Create Workspace
Merge remote-tracking branch 'origin/test'
Edge Class Added
Edge Removal
Latest version with fixed width and height.
Added weights, selection and node creation.
Node class refactor

refactored the node class for the best compatibility
Merging changes in test to here

Trying to integrate this branch with the changes made in test
--pro.user

Removing .pro.user file again
Merge branch 'Ruud' into test

Conflicts:
	IntelliGraph/colour.h
	IntelliGraph/edge.cpp
	IntelliGraph/edge.h
	IntelliGraph/mainwindow.h
	IntelliGraph/mainwindow.ui
	IntelliGraph/workspace.cpp
	IntelliGraph/workspace.h
Fix what I broke

Guess I broke something