Merge branch 'master' of https://github.com/imtibbet/CS351

Conflicts:
	graphics/include/floodfill.h
Got rid of pileup
messed it up a little.. trying to fix