ascii correction (general webpage)
Merge remote-tracking branch 'upstream/master'
steven schw in the people tab, changed place (slava's petition)