New post
Correct post date
Merge branch 'master' of github.com:OliverJAsh/oliverash.me

Conflicts:
	source/_posts/2013-01-08-IMG_2386.md