code commented
Merge branch 'master' of https://github.com/05lindne/g2

Conflicts:
	FitG2.m
	g2.sublime-project
	g2.sublime-workspace