show off a bit more, like a douchebag
Merge branch 'master' of ssh://github.com/sndrs/portfolio

Conflicts:
	app/_posts/2010-02-01-globrix.md