five
Merge branch 'master' of github.com:hpcugent/vsc_test
five5
your version was a lot better!

Conflicts:
	test.txt
consistency
fix remarks
Merge pull request #1 from boegel/master

double numbers everywhere