testing multiple controller
Removed the comments from merge in .gitignore CHANGE YOUR .HTACCESS FILES TO RewriteBase /user/Folder location of capstone.
Merge branch 'master' of https://github.com/CapstoneFleetIntelligience/Fleet into admin-cust
Condense registration process to one page. Adjustment to the database insertions
User authentication working and some commenting.
new feature: add delivery (view only)
pulled master
misc update
Set user session data.
feature update: add items (fully functional)

stores items to database needs for validation
Feature update: add delivery (fully functional)

add delivery creates or updates a customer and creates a delivery in the
db.
misc update
misc update
misc update
merge admin-cust
New Feature: Build checklist (fully functional)
Remove .htacess

.gitignore this
Admin can now add new users to business.
Merge branch 'Employee-creation'

Conflicts:
	application/config/routes.php
	application/controllers/site_controller.php
Quick fix.