solved some team-problems
Merge branch 'master' of https://github.com/ninux/prg1