added nav bar
Merge branch 'master' of https://github.com/nicklasjust/fredagsgif

Conflicts:
	index.php
	upload.php
	uploader.php