team.xml
Merge branch 'master' of https://github.com/anhdv282/IXJ

Conflicts:
	Assignment/src/java/dal/TeamDAL.java