update
Merge branch 'master' of github.com:jackie19/DressingRoom

Conflicts:
	.idea/.name
	.idea/modules.xml