Added files
Merged file
Merge branch 'master' of https://github.com/cwi-swat/rascal.git

Conflicts:
	rascal-test/wr.txt