merge with master
Merge branch 'master' of http://github.com/bps10/bps10.github.com

* 'master' of http://github.com/bps10/bps10.github.com:
  remaking the site
  added maps
minor css change, add colormodel