merge + pull request
Merge branch 'master' of https://github.com/DrunkReaperMatt/LOG121-E2014

Conflicts:
	LAB2_JSGervais_MPilon/src/ListeChainee.java