this is another change
Merge branch 'master' into development

Conflicts:
	hello.txt
Merge pull request #2 from jmstan/development

this is another change