Merge branch 'gh-pages' of https://github.com/gerbal/fall2013 into gh-pages
Merge branch 'gh-pages' of https://github.com/gerbal/fall2013 into gh-pages
Merge branch 'gh-pages' of https://github.com/gerbal/fall2013 into gh-pages
favicon now supports higher resolutions, should look pretty everywhere
prettier favicon, removed a cruft file
Merge branch 'gh-pages' of https://github.com/silshack/fall2013 into gh-pages
minor edits to local files
Merge branch 'gh-pages' of https://github.com/gerbal/fall2013 into gh-pages
merging conflicts
added an awesome blog post
typo
prettificaiton and edditing
Merge branch 'gh-pages' of http://github.com/silshack/fall2013 into gh-pages

Conflicts:
	_posts/elliott/2013-10-14-forteenth-class.md
Merge pull request #370 from gerbal/gh-pages

Higher resolution favicon