game is working and compiles
Thief is working
made changes before pull
Merge branch 'master' of https://github.com/isaacpfleegor/FinalProj
I'm not sure what a merge is