login code and search code
fixed logintest
Merge branch 'Iris' into Jeroen
login code modified
modified login test
Merge branch 'Iris' into Jeroen
New project, works with GIT now, includes all work done on the website so far
Merge branch 'Bas' of https://github.com/utwente-di/di14 into Bas

Conflicts:
	Code/src/main/webapp/WEB-INF/web.xml
small fixes
merge conflicts
search code
Fixing git
Fixing git
Merge branch 'Joyce'

Conflicts:
	Code/src/main/webapp/register.jsp
Merge branch 'Iris'
Merge branch 'Sophie'

Conflicts:
	Code/.classpath
	Code/.gitignore
	Code/.project
	Code/src/main/webapp/about.html
	Code/src/main/webapp/best.html
	Code/src/main/webapp/css/stylesheet.css
	Code/src/main/webapp/index.html
	Code/src/main/webapp/kvk.html
	Code/src/main/webapp/new.html
	Code/src/main/webapp/register.jsp
	Code/src/main/webapp/search.html
	Code/src/main/webapp/submit.html
	Code/src/main/webapp/submit.jsp
	Code/src/test/java/formHandlers/LoginTest.java
Fixing git
removed unusefull data
Fixing git
addcomments code geschreven