Save stuff before Ubuntu update
Merge branch 'master' of github.com:SRenan/CPPICS

Conflicts:
	seg.R
	seg.cpp