more language page
Merge branch 'master' of github.com:wweliz/tandem
finishing set lang
two pages almost done
update
update
solve merge conflict to add ollie's changes