first commit
add corrected syntax
Merge branch 'gh-pages' of https://github.com/maning/noah-wb-workshop into gh-pages
added ~ in gitignore
resolve conflicts in map1.html
merge map1 conflict