COMMIT IT YO
yep
Merge branch 'master' of https://github.com/Jeremy-Shields/TenantProject

Conflicts:
	app/Config/database.php