six commit
Merge branch 'master' of https://github.com/bird5/DemoRepository

Conflicts:
	demo1.php