changed the progress bar back to a number
Merge remote-tracking branch 'origin/master'
merged storyboard
Merge remote-tracking branch 'origin'