mae more specific
Merge branch 'master' of https://github.com/aoussama/newGitTest

Conflicts:
	index.html
made this commit
because i tought it was really important
necessary really