menu
merge conflicts
commiting to allow pull
initial dashboard design
got jquery menu bar working
merge conflicts