updates
Merge branch 'develop' of https://github.com/jmmaloney4/voltz into develop

Conflicts:
	vzrt.h