Merge branch 'gh-pages'
week 1 fixes

changed some fonts, colors, functions, etc to get it all working
smashingly!
Merge branch 'master' into gh-pages
changed comments

merging branches