trying to get nav bar working, spacing problem
Merge branch 'master' of https://github.com/ktp-dev/website

Conflicts:
	public/index.html