Update html
Update html
Add navi
add footer
Merge branch 'feature/navigation' into develop
Merge branch 'release/1.0'

Conflicts:
	octocat.txt