Merge branch 'gh-pages' of github.com:Blucka12/spring2014 into Blucka12-gh-pages
Updated config for strikethru
Merge branch 'gh-pages' of github.com:silshack/spring2014 into gh-pages