Fixing git once again
Merge branch 'Bas'
Merge branch 'Sophie'

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/formHandlers/CategoryChecker.java
	Code/src/main/java/nl/utwente/thinktank/formHandlers/Submit.java
	Code/src/main/java/nl/utwente/thinktank/spamFilter/Bayesian.java
	Code/src/main/java/nl/utwente/thinktank/spamFilter/good.txt
Merge branch 'Jeroen'

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/formHandlers/CategoryChecker.java
	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/formHandlers/UTRegister.java
	Code/src/main/java/nl/utwente/thinktank/spamFilter/Bayesian.java
	Code/src/main/java/nl/utwente/thinktank/spamFilter/SpamFilter.java
	Code/src/main/webapp/register.jsp