Some Changes

Some Changes
Merge branch 'master' of https://github.com/soltree86/TheGameShop