Merge origin/master

Conflicts:
	src/graphicslab06/FlagTest.java
	src/graphicslab06/GL6Util.java