Commit 13398e31 authored by jp6g18's avatar jp6g18
Browse files

Merge branch 'Jack' into 'master'

Merge in Jack's changes

Closes #45 and #43

See merge request !23
parents 164f6938 7097056c
Pipeline #883 passed with stage
in 43 seconds