ignore .idea
Merge branch 'master' of https://github.com/Mikaie/nodeshop

Conflicts:
	.idea/workspace.xml