startup-systems · Krystalllll · Sep 26, 2016 · Sep 26, 2016 · Sep 26, 2016 · Sep 26, 2016
diff --git a/README.md b/README.md
@@ -1,16 +1,32 @@
 # Mashup project
 
-This project is open-ended! Requirements:
+This project is open-ended!
 
-* Build a site that uses data from at least one external API in an interesting, interactive way.
+* [AJAX demos](https://github.com/advanced-js/deck/tree/gh-pages/demos/ajax)
+* [inspiration?](http://www.programmableweb.com/mashups)
+
+## Requirements
+
+* Build a site that uses data from at least one external API in an interesting, interactive way. (**80%**)
+* HTML validation (using the [Nu HTML Checker](https://validator.w3.org/nu/)) must pass. (**10%**)
+* JavaScript linting (using the configured [JSHint](http://jshint.com/about/)) must pass. (**10%**)
 * Replace this README with a description of the project.
-* You are welcome to use any 3rd-party libraries/frameworks – just load them from a CDN (e.g. [cdnjs](http://cdnjs.com)), or put them under the [`vendor/`](vendor/) folder.
-* **Do not commit the `client_secret` (or anything else from an API that says "token" or "secret")**, as a hacker could use this to make requests on behalf of you.
 
-The JS code should be **non-trivial**. That being said... start simple! (Just get the data to show up on the page.) No server-side coding is required, but feel free to create a backend in whatever language if you like, if you need one.
+### Extra credit
 
-* [AJAX demos](https://github.com/advanced-js/deck/tree/gh-pages/demos/ajax)
-* [inspiration?](http://www.programmableweb.com/mashups)
+Too easy?
+
+* Build in an [object-oriented](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Introduction_to_Object-Oriented_JavaScript) way (**10%**)
+* Add fancy interactivity/animations (**10%**)
+
+If you do either of these, please let Aidan know so he can take a look.
+
+## Tips
+
+* The JS code should be **non-trivial**. That being said... start simple! (Just get the data to show up on the page.)
+* No server-side coding is required, but feel free to create a backend in whatever language if you like, if you need one.
+* You are welcome to use any 3rd-party libraries/frameworks – just load them from a CDN (e.g. [cdnjs](http://cdnjs.com)), or put them under the [`vendor/`](vendor/) folder.
+* **Do not commit the `client_secret` (or anything else from an API that says "token" or "secret")**, as a hacker could use this to make requests on behalf of you.
 
 ## Finding an API
 
@@ -21,11 +37,6 @@ A couple things to look for in an API (or at least the endpoints you're using) f
 
 Here is a [list of API suggestions](https://gist.github.com/afeld/4952991).
 
-## Too easy?
-
-* build in an object-oriented way
-* add fancy interactivity/animations
-
 ## Running tests locally
 
 Within this repository directory in your [virtual machine](https://github.com/startup-systems/vm):

diff --git a/index.html b/index.html
@@ -2,7 +2,57 @@
 <html>
   <head>
     <title>Mashup</title>
+    <style>
+      #map {
+        height: 400px;
+        width: 100%;
+       }
+    </style>
   </head>
   <body>
+    <h3>Mashup_google map</h3>
+      Enter Address:<br>
+      <input type="text" id="location"><br>
+      <input type="button" value="Submit" onclick="Mapinit()"/>
+
+
+    <div id="map"></div>
+    <script>
+      var map;
+      function initMap() {
+
+                  var uluru = {lat: 40.7128, lng: -74.0059};
+                  var geocoder = new google.maps.Geocoder();
+                  var map = new google.maps.Map(document.getElementById('map'), {
+                  zoom: 6,
+                  center: uluru
+                  });
+                  var marker = new google.maps.Marker({
+                  position: uluru,
+                  map: map
+                  });
+      }
+    </script>
+
+    <script src="https://code.jquery.com/jquery-3.1.0.js"></script>
+    <script type="text/javascript">  
+      function Mapinit(){
+        var address = document.getElementById("location").value;     
+        $.ajax({
+            url: "https://maps.googleapis.com/maps/api/geocode/json?address="+location+"&key=AIzaSyBNNRYFdgYqPMPaWvgFjZD9dAeR06Kii1c",
+            success: function (data) {
+                var result = JSON.parse(data);
+                alert(result.results[0].geometry);
+            },
+            error: function () {
+                alert("Page not found");
+            }
+        });
+      }
+    </script>
+
+
+    <script async defer src="https://maps.googleapis.com/maps/api/js?key=AIzaSyBNNRYFdgYqPMPaWvgFjZD9dAeR06Kii1c&callback=initMap">
+    </script>
   </body>
 </html>