merge what? come on.
Merge branch 'master' of git://github.com/mlschmidt/projectCourse

Conflicts:
	VirtualWorld/src/virtual/world/Water.java
Merge branch 'master' of git://github.com/mlschmidt/projectCourse

Conflicts:
	VirtualWorld/src/virtual/world/Water.java
I have no idea any more. Merge branch 'master' of git://github.com/mlschmidt/projectCourse

Conflicts:
	VirtualWorld/src/virtual/world/Water.java
eSim with compass, almost done. Maven is still shi....
lalala same as last