git pushMerge branch 'master' of github.com:xajkep/Teaching-HEIGVD-AMT-2015-Project
git pushMerge branch 'master' of github.com:xajkep/Teaching-HEIGVD-AMT-2015-Project

xajkep/Teaching-HEIGVD-AMT-2015-Project,xajkep/Teaching-HEIGVD-AMT-2015-Project,xajkep/Teaching-HEIGVD-AMT-2015-Project