Week 6 G (illness sucks) and week 7 VG (yay) completed
Merge branch 'master' of github.com:Nazgir/paradis