G added
Merge branch 'master' of https://github.com/sk1ll3r/SleepApneaAndroid

Conflicts:
	test.txt