Updates
Updates from intellij

Merge branch 'master' of https://github.com/katmonkey/com.katmonkey.repo.baseballschedule

Conflicts:
	.classpath