update github
Merge branch 'master' of https://github.com/alfcrisci/socialgeosensing

Conflicts:
	README.md
	grid_functions.r
	socialgeosensing_mclass_code.r