blarg
Merge branch 'master' of https://github.com/avitkus/ForceSim.git

Conflicts:
	forcesim/src/forcesim/window/Window.java