mor fixes
merge & fix
merge
merge ffs
merge.....................!
MEEEEEERGA?!
Merge branch 'master' of https://github.com/denper-0/M7012E

Conflicts:
	Room.cpp