change navbar
Merge branch 'master' of https://github.com/ohayou/ohayou.github.io

Conflicts:
	images/Thumbs.db