ignore phpstorm files
more attempts to ignore some files
hmmm
Merge branch 'master' of github.com:rikh42/laravel-test

Conflicts:
	.idea/workspace.xml
fix