Lab4 Iffy - Starting lab 7
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/cs355/solution/CS355Controller.java
Lab 7 - Brightness, Contrast, Median, Blur all working