deleted all routes for dashboard
Merge branch 'deleting_dashboard' of github.com:StephanMusgrave/ProjectX
removed dashboard routes and controller. redirected all paths to user profile instead. tests now failing
Merge branch 'master' of github.com:StephanMusgrave/ProjectX into deleting_dashboard
Merge branch 'deleting_dashboard'
deleted duplicate of 'cancel my account' on user update page
Merge branch 'master' of github.com:StephanMusgrave/ProjectX into deleting_dashboard
revert back to original layout
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Merge branch 'deleting_dashboard' of github.com:StephanMusgrave/ProjectX
fixed index merge conflict
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
fixed merge conflict related to the search box
solved errors
Map put modal popup
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
Merge conflict
Merge branch 'master' of github.com:StephanMusgrave/ProjectX
fixed merge conflict