adding first json stuff
Fixed merge conflicts
Committing make-calendar.js incase we need to go back to it if the date picker barfs
Merge branch 'master' of https://github.com/C-Compton/BookIt into formDev_Json_1.0
Merge pull request #33 from ThuThreeFour/angularDev

added client registration form and validation
Adding ability to save and load appointments
Really dont know how git works
Merge branch 'master' of https://github.com/C-Compton/BookIt into formDev_Json_1.0
Merge pull request #30 from jacob-nappi/formDev_Json_1.0

Form dev json 1.0
stuff
Here goes nothing, hopefully fixed stuff
Merge pull request #34 from jacob-nappi/formDev_Json_1.0

Form dev json 1.0
Totally fixed everything.....I hope
Merge pull request #35 from jacob-nappi/formDev_Json_1.0

Totally fixed everything.....I hope
Addjusted some CSS and removed dead buttons from home page
Merge branch 'master' of github.com:C-Compton/BookIt into betaDev
php is hard
Chris knows git better
Merge pull request #36 from jacob-nappi/formDev_Json_1.0

Form dev json 1.0
Merge branch 'master' of github.com:C-Compton/BookIt into betaDev