.
Merge branch 'master' of github.com:sturcotte06/sporacid-gti410

Conflicts:
	src/j2dcg/src/controller/ImageLineFiller.java
	src/j2dcg/src/sporacid/gti410/labo2/filling/BoundaryFill.java