stuff
Merge branch 'master' of https://github.com/Andrux51/mtg-json-app