Continued work on stages 3 and 4
Merge remote-tracking branch 'upstream/master'
Semi-finalized work on stages 3 and 4
Merge branch 'master' of https://github.com/legendre6891/caltech-scheduler
Merge pull request #3 from codyhan94/master

parsing and checking functions