Ajout de l'option 6 fonctionnel et 7 partiellement
Modification 2 + 
Merge branch 'master' of
https://github.com/DrunkReaperMatt/LOG430-A2014.git

Conflicts:
	Lab01/src/ca/etsmtl/log430/lab1/Displays.java
	Lab01/src/ca/etsmtl/log430/lab1/Menus.java
	Lab01/src/ca/etsmtl/log430/lab1/ResourceAssignment.java