heh heh
ojoj
Merge branch 'master' into ballaste-branchen

Conflicts:
	SwingProj/src/LarsClass.java
heh heh
Merge branch 'master' of https://github.com/MahApp/OnGit.git