Ignore swp
these shouldn't be tracked
don't care
new stylez
Merge branch 'master' of https://github.com/nathanleclaire/blog

Conflicts:
	.themes/Pageturner
	public/atom.xml
	public/blog/2013/02/06/learn-node-dot-js-the-troll-way/index.html
	public/blog/archives/index.html
	public/blog/categories/development/atom.xml
	public/blog/categories/development/index.html
	public/blog/categories/javascript/atom.xml
	public/blog/categories/javascript/index.html
	public/blog/categories/node-js/atom.xml
	public/blog/categories/node-js/index.html
	public/index.html
	public/javascripts/twitter.js
	public/sitemap.xml
	public/stylesheets/main.css
	public/stylesheets/screen.css