setup nav bar
fixed merge conflictsMerge branch 'droppable' of https://github.com/cpkenn09y/PogParty into droppable

Conflicts:
	structure.css