set up for localhost
editing search more
trying to merge
test
trying to change branches
pulling master
Merge branch 'addedDB'