changed .gitignore
removed javascript
add google map
add geolocation search
conflict modify
Merge pull request #3 from hayashi1/feature_18

Feature 18