Stop condieties, voorwerk voor selecteren van algoritme
Added stopconditions

	renamed:    ASPmetGUI/src/aspmetgui/60blocks -> ASPmetGUI/src/60blocks
	modified:   ASPmetGUI/src/aspmetgui/Marian.java
	modified:   ASPmetGUI/src/aspmetgui/drawProblem.java
	ASPmetGUI/build/
	ASPmetGUI/dist/
	ASPmetGUI/nbproject/private/
	ASPmetGUI/src/aspmetgui/Exceptions/
	ASPmetGUI/src/aspmetgui/StopConditionsMarian.java
stopconditions and more
Merge branch 'master' of https://github.com/nyxus/ASPmetGUI
Merge branch 'master' of https://github.com/nyxus/ASPmetGUI

Conflicts:
	ASPmetGUI/src/60blocks
	ASPmetGUI/src/aspmetgui/MainScreenController.java