checkboxsubmit
Trying to fix git
versie Joyce 12-6
submit ccheck
Creating quarantaine
Merge branch 'Joyce' of https://github.com/utwente-di/di14 into Joyce

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/formHandlers/ExternalRegister.java
	Code/src/main/java/nl/utwente/thinktank/formHandlers/Submit.java
	Code/src/main/java/nl/utwente/thinktank/spamFilter/Bayesian.java
	Code/src/main/webapp/login.jsp
Merge branch 'Joyce' into Jeroen

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/formHandlers/ExternalRegister.java
	Code/src/main/java/nl/utwente/thinktank/formHandlers/Submit.java
	Code/src/main/java/nl/utwente/thinktank/spamFilter/Bayesian.java