added your emails don't match warning
Merge branch 'master' of github.com:nad69/tamc-prototype