Flattened collection to fix issues
Fixed path to icon.png
Merge branch 'master' into f14

Conflicts:
	README.md
	cs2500-grades/info.rkt
Should should have been merged