score update
Merge branch 'gh-pages' of github.com:csusbdt/201-2014-winter into gh-pages
finished grading labs 6 and 7