adjusted default laravel stuff
put .idea and sql to gitignore
temporarily add
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml