added back a complete readme
local folder configuration
configured environment
changed database variables to default
merge conflicts fixed