mOREA bug fixes
Merge branch 'master' of
https://github.com/djmailhot/CSE-Distributed-Systems.git

Conflicts:
	blah