added more TODO comments for different teams
detailed method docs 
switch to javadoc syntax
resolve conflict in comments
Merge branch 'master' of https://github.com/drkay/balance-it.git

Conflicts:
	src/com/example/balanceit/World.java