Merge pull request #40 from TeToNN/teambuilder

Teambuilder
Merge branch 'master' into teambuilder