test branching testing commit
Made changes on master branch
fixed issue 53
Fixed hotfix
finished issue 533 and committing
Merge branch 'iss533'

Conflicts:
	test.php
	test4.php