fuck
merge conflict
Merge branch 'master' of github.com:antiqe/RType
merge conflict
Merge branch 'master' of github.com:antiqe/RType

Conflicts:
	Client/SettingsState.cpp
rm