finished US1
Merge branch 'US1' of https://github.com/kevinwchen26/ToDoRPG