time = p
Merge branch 'master' of https://github.com/peq/WurstScript
Merge branch 'master' of https://github.com/peq/WurstScript
Yaya
Merge branch 'master' of https://github.com/peq/WurstScript
Interpolation update
Merge branch 'master' of https://github.com/peq/WurstScript
disabled stupid peqbugs he won't agree on that he made!
Merge branch 'master' of https://github.com/peq/WurstScript

Conflicts:
	de.peeeq.wurstscript/src/de/peeeq/wurstscript/translation/imtranslation/Flatten.java