Duo's test
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS into dev

Conflicts:
	hello.txt