test
Merge branch 'master' of https://github.com/GlacierWTF/Chinchilla

Conflicts:
	Chinchilla/Basechart.cs
Merge branch 'master' of https://github.com/GlacierWTF/Chinchilla