formatting fun
Merge branch 'develop' of https://github.com/CardistryApp/Cardistry into develop