Conflicts:
	.gitignore
	app/config/app.php
	app/config/database.php
	app/config/mail.php
	app/config/queue.php
	app/controllers/BaseController.php
	app/controllers/HomeController.php
	app/routes.php
	artisan
	bootstrap/start.php
	composer.json
	readme.md

Signed-off-by: Ben Corlett <bencorlett@me.com>
Adding a few more items. Have an alternate idea to try.

Signed-off-by: Ben Corlett <bencorlett@me.com>
Yep, on a winner.

Signed-off-by: Ben Corlett <bencorlett@me.com>