changed file names
fixed merge conflicts
set up d3 in angular directive
map linked to scope
map is now fully functional
customined dashboard and added logo
menus are working and animated
deleted useless code
setting up mailer