removed idea files
Merge branch 'themebranch'

Conflicts:
	.gitignore
ignore builds
Merge branch 'master' of github.com:marabooyankee/pirates-harr

Conflicts:
	app/config/packages/jasonlewis/basset/config.php
	app/routes.php
	app/views/home/layout.blade.php
	app/views/pages/homemain.blade.php
	public/builds/.gitignore
removed .idea files