almost functional
Merge branch 'master' of https://github.com/chrishcain/AngularTT