second commit
Merge branch 'master' of https://github.com/alessiodimichelangeli/gsnplus

Conflicts:
	README.md