normal commit
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS into dev
finished stats interface
look i'm committing
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS into dev

Conflicts:
	fNIRs/src/fNIRs/Hello.java