added maps
Merge branch 'master' of http://github.com/bps10/bps10.github.com

* 'master' of http://github.com/bps10/bps10.github.com: (23 commits)
  windows bullshit
  Update index.html
  update ERG slide
  added ERG flicker fig
  minor update to discussion
  update scale eq6
  minor position change
  minor format change
  minor positional change
  update to index
  purely organizational
  changed slide order slightly
  added ERG slide
  update for second day discussion
  update discussionII
  combine with Yoni
  fixed problem with fig5
  removed figure
  still trying to fix rendering prob
  minor fixes
  ...

Conflicts:
	index.html