changed rm2,3
Merge branch 'master' of https://github.com/Zhugejian/Figment

Conflicts:
	Assets/Room3.unity