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

Conflicts:
	changelog
Merge branch 'master' of https://github.com/Frotty/EBR