classpath and gitignore -- if this breaks everything, sorry! just
revert.
Merge branch 'master' of https://github.com/11791-04/project-team04.git