Changed all totals to percentage instead ofout of 10.
Merge origin/master