Adds commented code...
Merge origin/develop into develop

Conflicts:
	src/ca/qc/bdeb/inf203/model/Vague.java