Fixes percentage error
Merge branch 'master' of https://github.com/lonnelars/ab334-blue
Fixed numerous small things
fixes conflict
conflict