starting to create sub database
Merge branch 'master' of https://github.com/duke-compsci408-fall2014/FailSafe into substitutionDatabase
Created User class as well as MySQL access in the call server. Can now call user based on netid
generating day view from javascript
Merge branch 'master' of https://github.com/duke-compsci408-fall2014/FailSafe into substitutionDatabase
Removed deprecated sms_server files
Merge branch 'master' of github.com:duke-compsci408-fall2014/FailSafe
Preparing to separate javaScript files
Merge branch 'master' of github.com:duke-compsci408-fall2014/FailSafe
boopdidoop - added some code and feature; also tried to test responses
resolved merge conflict in call_server.py
day view responds to changes in month view
Merge remote-tracking branch 'origin/master' into subs
bug fixes with switching days in view
fixed gnarly merge