Minor updates
Merge branch 'master' of github.com:chaseberry/roomControl

Conflicts:
	roomModule.py