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

adding placeholder for final documentation
replaced stock icons with character icon w/o items
kwchen3 lim10: fixed error in set header
kwchen3 lim10: character icon has items
kwchen3 hlim10: character icons contain inventory items
 fixed mainactivity merge problems
Merge remote-tracking branch 'origin/US13'