Merge pull request #2 from krazdax5/master

forgotten merge
Merge pull request #3 from krazdax5/classerFormes_Charles

Merge pull request #2 from krazdax5/master
Merge pull request #4 from krazdax5/master

forgotten merge
Merge pull request #5 from krazdax5/modifMenu_charles

Merge pull request #4 from krazdax5/master
Added triAire to ClasseurFormes (triAire now works). Removed class triAire and package triFormes
Removed getForme(int num) from ListeFormes
Added detruireForme(Forme formeADetruire) to ListeFormes
paintComponent now works without getForme(int num)
Merge branch 'master' of https://github.com/krazdax5/log121_labs
Merge branch 'master' of https://github.com/krazdax5/log121_labs into integration_charles

Conflicts:
	log121_labs/src/main/formes/ListeFormes.java
	log121_labs/src/main/formes/util/ClasseurFormes.java
	log121_labs/src/main/triFormes/triAire.java