checkpoint
checkpoint, things are kind of working now...
Merge branch 'master' of github.com:3daughterdad/ssu14cs355