site.comments
modified:   _data/nerd_urls.yml
new file:   _posts/2014/2014-07-05-startssl-in-tomcat.markdown
Merge branch 'lax.github.com-jekyllrb' of github.com:Lax/lax.github.com into lax.github.com-jekyllrb

Conflicts:
	_includes/post_comments.html