second commit
Merge branch 'master' of github.com:takeyourrights/gms

Conflicts:
	gms.py