Merge branch 'master' of https://github.com/2joes/JoesComicShop.git