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

Conflicts:
	diamond/interpreter.c