minor change
minor changes
agm
Merge branch 'agm' of github.com:snap-stanford/snap into agm

Conflicts:
	snap-adv/agm.cpp
	snap-adv/agmfit.cpp
minor change