Testing branches
Commit from eclipse
Ignore all eclipse files
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS into dev
Duo's test
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS into dev

Conflicts:
	hello.txt
i did it
adding Hello gui
changed Hello
Test
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS.git into dev

Conflicts:
	fNIRs/src/fNIRs/Hello.java
Delete .classpath should not be tracked
Delete .project should not be tracked
better gui
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS.git into dev
Test
Added file dialog and file list