Adding models
Merge branch 'master' of https://github.com/chrisdietz/TimeTrax.git