test edit
Merge branch 'master' of https://github.com/mgjk/Bash-Bouncing-Ball

Conflicts:
	README