I'm definitely having so much fun that I've changed the functionality to
include exclamation marks.
Merge branch 'master' of
https://github.com/mathavan/MyTestRepository.git

I chose to use my version of the conflicting line because it works
better. Discussed with Mathavan.

Conflicts:
	src/com/bcsg/funstuff/App.java