updates
Merge branch 'gh-pages' of https://github.com/harvestchoice/mapspam2005 into gh-pages