add score reset functionality
fix conflict
replace error message if score fails to save
Merge branch 'style-all-the-forms'