A working commit while I figure out master
Merge branch 'master' of https://github.com/kylelin47/COP-Project into working
Final merge
Merge pull request #21 from kylelin47/working

A working commit while I figure out master