Merge branch 'master' of https://github.com/TomFalkner/text-blaster

Conflicts:
	Text_Blaster.jsx
Merge branch 'master' of https://github.com/TomFalkner/text-blaster