Conflict
Merge branch 'master' of https://github.com/DJxLaurens/TheAteam4.git

Conflicts:
	war/WEB-INF/web.xml