Parabolic merge

Merge in first two notebooks of module 4