add
Merge branch 'master' of http://github.com/gmplayer/demo

Conflicts:
	test.txt