Before pull
Merged pony_ea.js
pony_gp.js up to date with tron_pony_gp.js
Extended primitives for AI
Before pull
Resolved confilct
Merge branch 'master' of https://github.com/hembergerik/sprint_ec_openedx
Merge branch 'master' of https://github.com/hembergerik/sprint_ec_openedx