Tested adding my name for a push.
Merge branch 'master' of https://github.com/byui-acm/battle-game

Conflicts:
	test.txt