Merge branch 'readme' into develop
Merge branch 'hotfix' into develop
meh
Stuff
Hello, JSON
Added setup script.
Added error messages to setup.py
stuff
setup
Merge branch 'develop' of github.com:csalajan/Time_Tracking into csalajan-develop
fixed pay periods
Merge branch 'craig' into develop