Done.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/insidion/processing/assignment6/HeightMap.java