trying to get changes
Merge branch 'master' of github.com:am205-project/parareal
merge
wrote some stuff
fixed merge