Merge pull request #1 from FearTheDust/master

Added documentation for World. I'm not sure why the indentation was messed up on the first commit, it wasn't like that in my IDE
Merge pull request #2 from FearTheDust/master

Lots of formatting and commenting
Formatting
Updated gitignore
Altered the Shop design. Basically Shop is now a StockedShop (hence the deletion) which handles the mainStock only. (Adding & removing won't effect the mainStock as description states).
GeneralStore remains mostly the same but all playerStock features moved in here so changes had to be made. Attempted to generalize the Shop and get rid of a few shop instanceof GeneralStore.
As Shop design was altered, new StockedShop was changed to new Shop.
As Shop design was altered I was able to delete some shop instanceof GeneralStore lines and replace it with a check if the shop has a playerStock.