storing local changes
added .DS_Store and db .DS_store to gitignore
resolved routes conflict