Updating conflicts
resolve conflicts
resolve conflict
resolve conflict
Merge branch 'master' of https://github.com/DuncanOgle/flatfile

Conflicts:
	index.php
	posts/This is post 2|20140213134945.md