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

Conflicts:
	structure.css
Merge pull request #5 from cpkenn09y/droppable

droppable
Merge branch 'master' into set_up_db
deleted unnecessary js file, moved files into correct folders