update
Merge branch 'master' of https://github.com/Blunderchips/Dwarf2D

Conflicts:
	src/dwarf/graphics/Circle.java
	src/dwarf/graphics/Rectangle.java