some refactoring
Merge branch 'master' of github.com:mariomainz/devcon3-teams