Added code and stuff
Merge branch 'master' of https://github.com/jordanywhite/cs376Proj