initial commit
Merge branch 'master' of github.com:laurijn/socialgeo

Conflicts:
	README.md