Merge branch 'master' of https://github.com/kevinwchen26/ToDoRPG
Merge branch 'US15' of https://github.com/kevinwchen26/ToDoRPG