messing with a mark as done controller method
fixed merge conflicts
updated class on check icon
Merge branch 'styles_two' into edit_fix_local
Merge branch 'styles_two' into edit_fix_local
Merge branch 'styles_two' into edit_fix_local
Merge branch 'quotes_local' into edit_fix_local
new color scheme, maybe