small changes
Merge branch 'master' of https://github.com/CyVis/drunken-ninja

Conflicts:
	CyVis_1/src/cyvis/JsonRead.java
	CyVis_1/src/cyvis/JsonWrite.java