avant stivy
Merge branch 'master' of https://github.com/ark2812/GeoNum

Conflicts:
	Code/watson.c