project changes
database stuff
Merge branch 'keanu_home' of https://github.com/uzuzjmd/UnterrichtMe into keanu_home

Conflicts:
	UnterrichtMeProjekt/src/java/database/MysqlConnect.java
project properties changed
databse changes
Merge branch 'master' of https://github.com/uzuzjmd/UnterrichtMe into keanu_home

Conflicts:
	UnterrichtMeProjekt/web/jsp/highscore.jsp
stuff
stuff
test
test