Merge branch 'research' of github.com:sebspain/sebspain.github.io
Merge branch 'master' of github.com:sebspain/sebspain.github.io
updated to allow filenames with spaces