Merge branch 'Development' of https://github.com/Wolfpack150/BaseballProject into Interface

Conflicts:
	app/src/main/res/layout/activity_box.xml
	app/src/main/res/layout/activity_play_ball.xml