Pusing PI side of the code into place.
picode.jar conflicts. Need best practice for addressing these because
they're going to happen a lot.
x
x
ignore picode.jar
Deactivated autobuild on picode.jar
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/picode.jar