Signed-off-by: markinator88 <rutledgemarkr@gmail.com>
Merge branch 'master' of
https://github.com/markinator88/locorobo-coverage-calculator.git

Conflicts:
	src/Room.java

Signed-off-by: markinator88 <rutledgemarkr@gmail.com>