sfsadfsdg
add test 2 - test
Merge branch 'test'

Conflicts:
	optionsroyale/test.txt