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