Use HTML5 pushstate. thanks @joelhans
Merge branch 'development' into push_state

Conflicts:
	app/_site/index.html
Merge pull request #3 from rcdilorenzo/push_state

HTML5 Push State