deleted the line inside the character card
fixed conflicts on app.css
Merge branch 'develop' of github.com:ccstevenson/KenjisQuestFrontend into develop
Merge branch 'develop' of github.com:ccstevenson/KenjisQuestFrontend into develop