dingen oa logout
Cleaning up code
Merge branch 'Iris' into Jeroen

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/database/Connect.java
Added Log Out