midst of adding sgd time measures
Merge branch 'master' of github.com:psastras/Snowblower

Conflicts:
	src/client.py