server commit conlict 2.0
commit sever
Merge branch 'master' of https://github.com/Deloux/repo

Conflicts:
	index.php