Remove shikashi include
Merge branch 'dev' of github.com:CodeForKids/rubysadventure into dev
Merge branch 'dev'