Merge pull request #31 from jmoenig/master

Update CS10 Fork
cleaned commented-out functions
Merge remote-tracking branch 'origin/master' into graphics-ava