Merge pull request #11 from martme/haakon

Haakon
Additions to chp6
Prittify ch4
Merge pull request #12 from martme/martin

Martin
chp5 ingress edit
chp5 and chp6. added new resultimages