Modifications
Merge branch 'master' of github.com:yangmw/fedorov
Fixed conflicts
Conflicts:
	1.interpolation/splot.gpi
some changes
Merge branch 'master' of github.com:yangmw/fedorov
Fixed conflicts
Conflicts:
	1.interpolation/splot.gpi
Polish (have a clock syncronization bug on lifa)