nav work
Merge branch 'development' of https://github.com/makapen/makapen.github.io into development
ham fixes
Merge branch 'development' of https://github.com/makapen/makapen.github.io into development