fixed logintest
Merge branch 'Iris' into Jeroen
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