commit 1 evol1
evol1 1111 test
Merge remote-tracking branch 'mouradlgittuto/develop'

Conflicts:
	index2.html
test in tehs end of file
Merge branch 'develop' of https://github.com/mouradl/gittuto
test in tehs end of file 2
Merge branch 'master' into develop