here's your stupid commit
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS into dev
run button progress bar
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS into dev

Conflicts:
	fNIRs/process