update
merge
updating gitignore. Removed database from repo