Im pissed
Merge branch 'master' of https://github.com/Wolfpack150/BaseballProject

Conflicts:
	.idea/vcs.xml
	baseballNotesLog.java