change permalinks & edit a post
Merge branch 'master' of https://github.com/DarkKate/darkkate.github.io

Conflicts:
	_posts/2014-05-25-my-lovely-bike.md