Added error handling so that users can not be assigned twice to a client
put layouts in partials
views
layout into partials
merging feedview
What?
Fixed conflicts
Resolved more html conflicts
feed added to dashboard
merging feedview branch. follow_ups added to dashboard
added follow_ups to client show page
more views
changed layout of dashboard, fixed users index
updated navbars, client index with photos, navigation
client info updated
changes to views and navigation
updated client show view
What?
added javascript from Ben
javascript login windows