.
Merge branch 'dev-scaffold' of https://github.com/thekage91/CatalogOfDesires into dev-scaffold

Conflicts:
	.idea/CatalogOfDesires.iml