Local merge
Merge branch 'master' of https://github.com/gandalfcode/gandalf
Merge branch 'master' of https://github.com/gandalfcode/gandalf
Merge branch 'master' of https://github.com/gandalfcode/gandalf
Local changes on c2pap
Merge branch 'master' of https://github.com/gandalfcode/gandalf
Merged conflicts
Merged conflicts
Merged conflicts
Added compiler directives for GSL code