changed workspace
created workspace class to replace subject class. collects conditions
files. method to add conditions to Hb/HbO files. now uses xlsread on
hatachi Hb/Hbo files. new preprocess_2 instead of preprocess_2013 jar
file.
Merge branch 'hamsarah' into dev

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

Conflicts:
	fNIRs/src/fNIRs/Hello.java