Changes
Merge branch 'master' of github.com:yangmw/fedorov

Conflicts:
	2.qr/makefile
Merge branch 'master' of github.com:yangmw/fedorov
Merge branch 'master' of github.com:yangmw/fedorov
Merge branch 'master' of github.com:yangmw/fedorov
Merge branch 'master' of github.com:yangmw/fedorov
Merge branch 'master' of github.com:yangmw/fedorov
Merge branch 'master' of github.com:yangmw/fedorov
Made changes to makefile and linking with -lm