Merge pull request #42 from Mchapuis/master

i got de pull
I commit my changes on January the third. They are good!

Signed-off-by: Travis Henry Martin <travis.h.martin@gmail.com>
Signed-off-by: Travis Henry Martin <travis.h.martin@gmail.com>
Merge branch 'master' of https://github.com/Mchapuis/ChromatoseGit into Mchapuis-master

Conflicts:
	Chromatose/Assets/ChromAssets/Art/Animations/spranim_ing.prefab
Merge pull request #35 from mysteriosum/master

bleh