Merge branch 'va'

Conflicts:
	.gitignore
	simulator/simulator.pde