add ability to update votes table
fix merge conflict
initial dashboard
add dashboard
Merge branch 'dashboard'