Merge branch 'master' into US10
paulkim6 jcheng26: Add startup code
Merge branch 'US10'
Merge branch 'master' of https://github.com/kevinwchen26/ToDoRPG