k
Merge branch 'master' of https://github.com/AdrianAmpt/Midget

Conflicts:
	bin/com/midget/common/Vector.class
	bin/com/midget/track/Cell.class