replace hard coded language with a token
Merge branch 'master' of github.com:atutor/ATutor