from cnam
Merge branch 'new_branch_name' of https://github.com/salimrahal/MyWork into new_branch_name

Conflicts:
	.gitignore
array