Merge branch 'US15'
lchen59 paulkim more in inventory
Merge branch 'master' of https://github.com/kevinwchen26/ToDoRPG into US15