removed map in header since it's a duplicate
Merge branch 'new_design' of https://github.com/agoln/FlashVolunteer into new_design