fixing bug: ssong25, kwchen3
Merge branch 'master' of https://github.com/kevinwchen26/ToDoRPG