read code
Merge branch 'master' of https://github.com/jbartolozzi/JimboTrace2

Conflicts:
	JimboTrace/JimboTrace/main.cpp