Merge remote-tracking branch 'origin/gh-pages'
added test output
Merge branch 'master' of github.com:edsu/wikigeo