new file:   .idea/runConfigurations/Development__fancyshop.xml
	new file:   .idea/runConfigurations/Production__fancyshop.xml
	new file:   .idea/runConfigurations/spec__fancyshop.xml
	new file:   .idea/runConfigurations/test__fancyshop.xml
	new file:   .idea/scopes/scope_settings.xml
	new file:   .idea/workspace.xml
Merge branch 'master' of github.com:simontaosim/fancyshop

Conflicts:
	.idea/workspace.xml

	new file:   .gitignore
	new file:   .idea/.generators