updates
Merge branch 'master' of https://github.com/eddyghabachisae/SMB215-2014-Projet-Librairie