Merge branch 'hotfix' into develop
started to change api stuff
api conversion in progress
T8 - Created forms for data validation
meh
Stuff
Hello, JSON
Added setup script.
Added error messages to setup.py
setup
Merge branch 'develop' of github.com:csalajan/Time_Tracking into csalajan-develop
fixed pay periods
Merge branch 'craig' into develop