test
Merge branch 'master' of https://github.com/wallem/RQA
test conflict
Resloved conflict.
Test conflict
resolved conflict again.