add changes to ToyProgram
Merge branch 'master' of github.com:ekelleyv/HCI

Conflicts:
	Processing/Project/Project.pde
	Processing/Project/Tag.pde
	Processing/Project/TagLibrary.pde