Merge remote-tracking branch 'origin/Antoine' into Kevin
update parser
Merge remote-tracking branch 'origin/Antoine' into Kevin
Merge branch 'Antoine' into develop
Merge branch 'Antoine' into develop
update parser
Merge remote-tracking branch 'origin/develop' into Kevin
test story modified
Merge remote-tracking branch 'origin/develop' into Guillaume
Actions now fully working (see Actions.html)
Actions now fully working
Merge remote-tracking branch 'origin/Guillaume' into Kevin
actions.js updated
Merge remote-tracking branch 'origin/Guillaume' into Kevin
Merge remote-tracking branch 'origin/Antoine' into Kevin

Conflicts:
	Javascript/animJs/elyse.js
Nushit
Kevin the racist asked me to remove text color
Merge remote-tracking branch 'origin/Guillaume' into Kevin

Conflicts:
	Javascript/animJs/elyse.js
color again
Update Parser Elyse/English teacher