derp
Merge branch 'master' of https://github.com/chunksahoy/TP-Final-Magasin

Conflicts:
	src/java/Magasin/Magasin.java