should work
Merge branch 'master' of https://github.com/n8harris/DB-Final-Project

Conflicts:
	Eclipse Project/mlb/bin/dataaccesslayer/HibernateUtil.class
	Eclipse Project/mlb/src/controller/TeamController.java
	Eclipse Project/mlb/src/dataaccesslayer/HibernateUtil.java