updated design doc
adding visualization for sleep line graph
merge coflict
added more api calls
Merge branch 'master' of https://github.com/6170-fa14/msuh_dchoi2_fmmoret_socho_finalProj
adding csrf handling
Merge branch 'master' of https://github.com/6170-fa14/msuh_dchoi2_fmmoret_socho_finalProj
users page on work
Merge branch 'master' of https://github.com/6170-fa14/msuh_dchoi2_fmmoret_socho_finalProj
made schedule prettier. started google api import
Made code a lot shorter
Merge branch 'master' of https://github.com/6170-fa14/msuh_dchoi2_fmmoret_socho_finalProj
users page working
Merge branch 'master' of https://github.com/6170-fa14/msuh_dchoi2_fmmoret_socho_finalProj
Revert to old
added friends api
adding average visualization
merge cofict
fixed get users
Merge branch 'master' of https://github.com/6170-fa14/msuh_dchoi2_fmmoret_socho_finalProj