updating local files
stashed calendar
Merge branch 'gh-pages' of https://github.com/jhollist/SciComp2014 into gh-pages