updated naming conventions for Fall 2013 version
Merge branch 'master' of github.com:ray-/cs193p