This is broken

I tried to make a pen combo list that will change the pen stroke
Merge branch 'master' of https://github.com/thomasjbarry/Image-Craft

Conflicts:
	tzk.imagecraft/build/built-jar.properties
	tzk.imagecraft/nbproject/private/private.xml
	tzk.imagecraft/src/tzk/image/ui/ColorSwatch.java
	tzk.imagecraft/src/tzk/image/ui/ImageCraft.form
	tzk.imagecraft/src/tzk/image/ui/ImageCraft.java
	tzk.imagecraft/src/tzk/image/ui/SimpleHistory.java