new format for conditions file has max cond number at top
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS.git into dev
Here are your freaking radio buttons
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
moved something a little bit to the right
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS.git into dev
logo saturation++
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS.git into dev
hooked up radio buttons
duo's did things in some tabs and stuff
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS.git into dev
merged my stats tab changes with Duo's, but clear button is in a bad place and doesn't seem to work
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS into dev

Conflicts:
	fNIRs/src/fNIRs/Hello.java
noticed clear button was missing in statsbranch...I think this is the merge I should have done before the last commit but thought I didn't need to.
Merge branch 'statsBranch' into dev
.
Conflicts:
	fNIRs/src/fNIRs/Hello.java
This branch finally has all the good stuff I tried to put in it earlier today. Removing Anova.java, stats tab is getting there with .csv support, clear button, & resetting lists.
Merge branch 'statsBranch' into dev

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

Conflicts:
	fNIRs/src/fNIRs/Hello.java
Finalized RapidDriver