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