not tracking app/config/database.php, cos .gitignore deleted it on latest pull. SO DO: git rm --cached app/config/database.php, commit and pull
Merge branch 'master' of github.com:surbhishah/UnifiedCloud