jsp
Merge branch 'master' of https://github.com/utwente-di/di05

Conflicts:
	ThinkTank2/src/main/webapp/index.jsp