Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
New story
Merge branch 'master' into gh-pages

Conflicts:
	love/upscaling.md
deleted story because WTF

I must have made a mistake somewhere, story seemed to be doubled but
the file wasn't coming up in finder.
Merge branch 'gh-pages'