hlim10 kchen26 : Refactoring
Merge branch 'master' of https://github.com/kevinwchen26/ToDoRPG into US15