java docs?
Merge branch 'develope' of https://github.com/kokhong20/SEPT-Assg into develope

Conflicts:
	src/model/PAColor.java