Get rid of PHPStorm stuff
Merge branch 'master' of https://github.com/acidjunk/wishlist

Conflicts:
	.idea/workspace.xml