restart
Merge branch 'master' of https://github.com/azcazc/math

Conflicts:
	v2/math/.classpath
cleaned v2