Update documentation

Clarify comments and finish documentation for classes and methods.
Resolve conflict.

Conflicts:
	rescuebot.java