escaperspells stash
Merge branch 'master' of https://github.com/Frotty/EBR

Conflicts:
	wurst/escaper/spells/EscaperSpells.wurst
stash
Merge branch 'master' of https://github.com/Frotty/EBR
ufufuf
Merge branch 'master' of https://github.com/Frotty/EBR
Merge branch 'master' of https://github.com/Frotty/EBR
pushy
Merge branch 'master' of https://github.com/Frotty/EBR

Conflicts:
	wurst/builder/Builder.wurst