Update index
Merge branch 'development' of https://github.com/DuncanOgle/flatfile into development

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