Stationary navbar
Merge branch 'master' of https://github.com/rgerd/PTPA-Website

Conflicts:
	css/style.css