checkboxsubmit
Want checkout conflict
Merge branch 'Joyce' of https://github.com/utwente-di/di14 into Joyce

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/testCode/test.java
Merging with Joyce