fixed progress bar conflict
Merge branch 'develop' of github.com:ccstevenson/KenjisQuestFrontend into characterColor
Merge branch 'develop' of github.com:ccstevenson/KenjisQuestFrontend into develop
Merge branch 'characterColor' into develop