Junit testing
Merge branch 'master' of https://github.com/bpscheper/Stutter

Conflicts:
	Stutter.java