edit text
Merge branch 'master' of https://github.com/ownorganization/local_test_repo

Conflicts:
	optionsroyale/test.txt
merge