removed foundation zerb
merging
fixed merge conflicts
added dropdown menu for new user