partial commit
Merge branch 'master' of github.com:nplutzik/TeamHaxxors