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

Conflicts:
	optionsroyale/app/skins/56/messages/messages_ja.properties
	optionsroyale/test.txt
tarata