Michael Rose 6ce8985a93 Merge branch 'scss-cleanup' into gh-pages ... Conflicts: _config.yml _includes/navigation.html _layouts/post.html _sass/_animations.scss _sass/_coderay.scss _sass/_elements.scss _sass/_layout.scss _sass/_site.scss _sass/_syntax.scss _sass/elements.scss assets/css/main.scss		2015-03-03 13:17:27 -05:00
..
page.html	Close open <p>	2015-03-03 13:01:21 -05:00
post.html	Merge branch 'scss-cleanup' into gh-pages	2015-03-03 13:17:27 -05:00