Merge pull request #23 from scasBot/beta

Beta
Fixed bug in merge
Merge branch 'master' of https://github.com/scasBot/i4
Merge branch 'beta' of https://github.com/scasBot/i4
Chart.js added
Fixed cases by priority
Merge pull request #30 from willyxiao/master

Some quick fixes