Clean up code a bit/Test .gitignore
Merge branch 'fileIO' of https://github.com/doug-yan/CS326 into fileIO

Conflicts:
	ColorSampler$ColorObject.class
	ColorSampler$WindowDestroyer.class
	ColorSampler.class