Merge branch 'FISTA' of github.com:rphlypo/connectivity into FISTA
Merge branch 'FISTA' of github.com:rphlypo/connectivity into FISTA