Merge branch 'master' of https://github.com/mysteriosum/ChromatoseGit

Conflicts:
	Chromatose/Assets/ChromAssets/Room Packages/Scenes/Module1_Scene1.unity
Merge branch 'master' of https://github.com/mysteriosum/ChromatoseGit

Conflicts:
	Chromatose/Assets/ChromAssets/Room Packages/Scenes/Module1_Scene1.unity
Signed-off-by: Travis Henry Martin <travis.h.martin@gmail.com>