mystery
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/franklinps/chivallati/GraphicsLab04/Background.java
	src/net/franklinps/chivallati/GraphicsLab04/House.java
	src/net/franklinps/chivallati/GraphicsLab04/Paint.java
	src/net/franklinps/chivallati/GraphicsLab04/Pool.java
	src/net/franklinps/chivallati/GraphicsLab04/Utility.java
update