adds initial google map to main user page
fixed conflict in development.log
Merge pull request #7 from ieatkimchi/Prelim_Map

Prelim map