Merge
Merge branch 'master' of https://github.com/JouperCoding/KanaLearner

Conflicts:
	KanaLearner/.idea/workspace.xml
Merge branch 'master' of https://github.com/JouperCoding/KanaLearner
Chart
Chart