i forgot what i did
Merge branch 'master' of github.com:Senney/CPSC599-RPG