more work on templates
fixed merge conflict in routes
worked on user_dashboard
Merge remote-tracking branch 'origin/phil_templates' into front_end_start
finished up dashboard for now; stylized heading on other pages
git push origin front_end_start