gitignore file
Merge branch 'master' of github.com:peq/WurstScript

Conflicts:
	de.peeeq.wurstscript/version2.properties