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

Conflicts:
	src/Parser.m