added borders to sprite
resolve conflicts, merged sprite-logo
Merge branch 'develop' of github.com:ccstevenson/KenjisQuestFrontend into develop