aaa
rm

Merge branch 'branch-test2' of https://github.com/stsmania/pkg into branch-test2

Conflicts:
	test.txt