niloyg dev env classpath
Merge remote-tracking branch 'origin/master'

Conflicts:
	project-team05/.classpath
Working pipeline
Merge branch 'master' of https://github.com/11791-5/project-team5.git