made a js file of the google maps code, and fixed map loading error
fixing merge conflict