ksteph/KnowMap — pull request #21 by haotianwang (2012-10-19 22:22:23+00:00)
Title: haotian test commit 3

just making sure this is how you do pull requests. All I did is add/delete a space from map.js. By the way, would you happen to know how to pull changes from the master branch to the haotianTest branch? Is that ever actually necessary? I'm wondering if my branch is ever too out of date, then a pull-request from haotianTest to master might be full of conflicts.