nav fixed
Merge branch 'master' of https://github.com/JmPotato/Pomash

Conflicts:
	Pomash/static/css/style.css