Intermediate check-in

Just checking in what i have so far, so I can get Chris's changes.
Merge branch 'master' of https://github.com/zactyy/cpts323