fixed up files
.
Merge branch 'gh-pages' of https://github.com/EID100/2013-winter into gh-pages