it gone
Merge branch 'master' of https://github.com/seegan/Myproj

Conflicts:
	sample.php
it gone
Conflicts:
	sample.php