Fix error
Merge branch 'master' of github.com:StephenSwat/GMR-Linux

Conflicts:
	gmr/app.py