seegan edit line 11
Merge branch 'master' of https://github.com/seegan/Myproj

Conflicts:
	sample.php