tabbed elements
modified
no message
tabbed with compsite
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

Conflicts:
	fNIRs/src/fNIRs/Hello.java
added deselect from list and remove from list. embiggened the window
added MatlabControl
duo did stuff?
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS into dev

Conflicts:
	fNIRs/src/fNIRs/Hello.java
We finally have a tab!
added subject.java
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS.git into dev

Conflicts:
	fNIRs/src/fNIRs/Hello.java
added iss and hatachi loading options
tab merge
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS into dev

Conflicts:
	fNIRs/src/fNIRs/Hello.java
minor changes
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS.git into dev
starting to handle nonexistent files
tabbed tabs