the user 2 adds a new code line
merge files fixed
Merge branch 'master' of https://github.com/jabrahamocampo/test

Conflicts:
	index.php