Merge branch 'master' of github.com:amedeedaboville/fnirseeg