- Change menu items
- Change main to static in Dbconnection.java
Merge branch 'master' of https://github.com/DJxLaurens/TheAteam4.git

Conflicts:
	war/header.jsp