Commit 04adb4db authored by William Clarke's avatar William Clarke
Browse files

Merge branch 'master' into 'master'

Merge for version 1.1.7 - pre FSL Course

Closes #6, #7, #11, #13, and #15

See merge request !25
parents baf4b0cf 8c75ef8f
Pipeline #11097 passed with stages
in 4 minutes and 13 seconds