no message
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS into dev

Conflicts:
	fNIRs/src/fNIRs/Hello.java
minor changes. trying to deal with excel sheet problem
did stuff to some button things
obese buttons
hooked in process list in dm tab
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS.git into dev
lost the change workspace button
sarah doesn't know what the opposite of undo is
Merge branch 'dev' of https://github.com/CS-Seminar/fNIRS.git into dev
sarah hates buttons
okay like for realsies one of these has to work
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
put xlsread back in
changed bounds of list
splash screen + disabled resize
splish splash
add JSplashScreen to you build pathsssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss
duodi d some upsies wit h teh logoooooo it back doh don't worry yalls