Test
Initial refactoring
Updated date format
Merge remote-tracking branch 'origin/new-data' into new-version

Conflicts:
	pages/index.json
	posts/1.md
	posts/index.json