My changes to resetting the inventory got erased, so I put them back in.
Merge branch 'master' of https://github.com/ZavaStudios/SeniorCapstone
Merge branch 'master' of https://github.com/ZavaStudios/SeniorCapstone
Merge branch 'master' of https://github.com/ZavaStudios/SeniorCapstone
Merge branch 'master' of https://github.com/ZavaStudios/SeniorCapstone
aa