Added ,gitignore back and the lib folder with JUnit
Adding /lib with the JUnit jar files because the local Ant build that works does not work on Travis
Correctly iusing the master branch instead of the gui branch
Again?
Merge branch 'master' of https://github.com/rhm12399/flag-capture

Conflicts:
	.gitignore
	bin/game/Game.class
	bin/game/Globals.class
	bin/gamepieces/BearTrap.class
	bin/gamepieces/CannotChallengeException.class
	bin/gamepieces/Defender.class
	bin/gamepieces/GamePiece.class
	bin/gamepieces/HumanFlag.class
	bin/gamepieces/Item.class
	bin/gamepieces/JailBreaker.class
	bin/gamepieces/Offensive.class
	bin/gamepieces/OpponentFlag.class
	bin/gamepieces/Reward.class
	bin/gamepieces/Unit.class
	bin/tests/GameTest.class
	bin/view/MapOne$AnimationListener.class
	bin/view/MapOne$ListenToKeys.class
	bin/view/MapOne.class
	bin/view/RunCaptureTheFlagFrame.class
	build.xml