new format for conditions file has max cond number at top
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS.git into dev
idk
added in new rapid miner run stuff and templates
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS.git into dev

Conflicts:
	fNIRs/src/fNIRs/Hello.java
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS.git into dev
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS.git into dev
hooked up radio buttons
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS.git into dev
changed process
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS.git into dev

Conflicts:
	fNIRs/src/fNIRs/Hello.java