test
Merge branch 'master' of https://github.com/MircoGit/RSR

Conflicts:
	RSR/main.cpp