message commit modif locale
Merge branch 'master' of https://github.com/wldblbll/my_first_repo

Conflicts:
	readme.txt