fixed database.yml
trying to reconcile files with demo
setup core functionality