modified:   Batter.java
	modified:   Pitcher.java
	modified:   Player.java
Merge branch 'master' of https://github.com/ushania/Baseball

Conflicts:
	bin/Batter.class