nav bar
Merge branch 'master' of https://github.com/ilanaiguana/Civia-Rosenberg-2014

Conflicts:
	top-nav.html
deleted some files