Hallgeirs new code
Merge branch 'master' of https://github.com/Istarnion/TeamBeard