spamfiltertest + submmittest + klassendiagram
Update schema.sql

SQL schema geupdate
delete post test
small fixes
Update README.md
Update README.md
deel code voteTest. afmaken als rating af is
deletePost query
searchbalk overal werking toegevoegd
presentaties sprintmeetings + deleteposttest
submit userid en searchbalk
fixing registration
Added a for loop to load posts, changed rating, added anonymous posts
Merge branch 'Sophie' of https://github.com/utwente-di/di14 into Sophie

Conflicts:
	Code/src/main/webapp/pages/about.jsp
	Code/src/main/webapp/pages/idea.jsp
	Code/src/main/webapp/pages/profile.jsp
	Code/src/main/webapp/pages/submit.jsp
	Code/src/main/webapp/site/idea.jsp
Merge branch 'Sophie' of https://github.com/utwente-di/di14 into Sophie

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/types/Post.java
	Code/src/main/webapp/pages/best.jsp
	Code/src/main/webapp/pages/index.jsp
	Code/src/main/webapp/pages/kvk.jsp
	Code/src/main/webapp/pages/new.jsp
	Code/src/main/webapp/pages/submit.jsp
	Code/src/main/webapp/register.jsp
	Code/src/main/webapp/site/about.jsp
	Code/src/main/webapp/site/idea.jsp
	Code/src/main/webapp/site/profile.jsp
fixing git
Merge branch 'Sophie'
Merge branch 'Joyce'

Conflicts:
	Code/src/main/webapp/pages/styles.css
	Code/src/main/webapp/site/9.jsp
	Code/src/main/webapp/site/best.jsp
	Code/src/main/webapp/site/idea.jsp
	Code/src/main/webapp/site/index.jsp
	Code/src/main/webapp/site/kvk.jsp
	Code/src/main/webapp/site/new.jsp
	Code/src/main/webapp/site/search.jsp
	Code/src/main/webapp/site/submit.jsp
	Code/src/test/java/nl/utwente/thinktank/formHandlers/SubmitTest.java
Merge branch 'Iris'

Conflicts:
	Code/src/test/java/nl/utwente/thinktank/formHandlers/SubmitTest.java
Merge branch 'Bas'

Conflicts:
	Code/src/main/webapp/site/best.jsp
	Code/src/main/webapp/site/idea.jsp
	Code/src/main/webapp/site/index.jsp
	Code/src/main/webapp/site/new.jsp
	Code/src/main/webapp/site/profile.jsp