Merge branch 'master' of https://github.com/comem/rockit

Conflicts:
	test/blabla.txt
Merge branch 'master' of https://github.com/comem/rockit

Conflicts:
	test/blabla.txt