minor edit
Merge branch 'dev_1.0' of https://github.com/charmelle/git_test into dev_1.0

Conflicts:
	testing.txt