ribbit ribbit
wtf I commited
Merge remote-tracking branch 'origin/marsbars' into color

Conflicts:
	JPTest/bin/jptest/MainPApplet.class
	JPTest/src/jptest/MainPApplet.java
commit with a box
rolled back
rolled back but with color