changes made by issue1 branch
changes made by issue1 branch
Merge branch 'issue1'

Conflicts:
	test.php
merge by master