pullll
Merge branch 'master' of https://github.com/IanKim-Git/LogTeam.git

Conflicts:
	ProgManager/target/classes/.gitignore