euh je ne sais plus
Merge branch 'master' of github.com:simsor/EasyAlgo

Conflicts:
	js/form.js
Merge branch 'master' of github.com:simsor/EasyAlgo