Conflict again
Merge branch 'master' of https://github.com/DeathWinged/CatalogueNew.git