Fixing bug where urls that didn't contain index.html couldn't navigate directly to recent posts.
fixed merge confict

Conflicts:
	js/controller.js