fixed routes and some view bugs
resolving merge conflicts
updated .gitignore