Resolve conflicts
Resolve conflicts

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