Small CSS fixes
Fixed location of media folder
Fixed top menu bar
Attempting to fix header; other misc stuff
Merge branch 'master' of github.com:irrationl/cs146-uphone

Conflicts:
	css/index.css

test