Minor changes, some functionality

Nothing really works, I'm just doing this to sync.
Merge branch 'master' of github.com:ZetaTwo/dd1346-javaprojekt