add changed2
add new file
Merge branch 'master' of https://github.com/fcsteagu/test

Conflicts:
	README.md