update feature
add Navi
Add footer
Merge branch 'feature/navigation' into develop

Conflicts:
	octocat.txt
Update