test commit for branching
Merge branch 'variant_test'
Merge branch 'master' of https://github.com/OpenBCI/OpenBCI_Processing
Adding Channel Controller

I apologize for the copy and paste (from local) move again. Last time.
Will branch and work out of github directory from here on out. Baby
steps.
Chip merging some changes?
Merge branch 'master' of https://github.com/chipaudette/OpenBCI_Processing into chipaudette-master

Conflicts:
	OpenBCI_GUI/output/OpenBCI_GUI$1.class
	OpenBCI_GUI/output/OpenBCI_GUI$2.class
	OpenBCI_GUI/output/OpenBCI_GUI$Button.class
	OpenBCI_GUI/output/OpenBCI_GUI$ChannelCountBox.class
	OpenBCI_GUI/output/OpenBCI_GUI$ControlPanel.class
	OpenBCI_GUI/output/OpenBCI_GUI$DataLogBox.class
	OpenBCI_GUI/output/OpenBCI_GUI$DataPacket_ADS1299.class
	OpenBCI_GUI/output/OpenBCI_GUI$DataSourceBox.class
	OpenBCI_GUI/output/OpenBCI_GUI$DataStatus.class
	OpenBCI_GUI/output/OpenBCI_GUI$DetectionData_FreqDomain.class
	OpenBCI_GUI/output/OpenBCI_GUI$EEG_Processing.class
	OpenBCI_GUI/output/OpenBCI_GUI$EEG_Processing_User.class
	OpenBCI_GUI/output/OpenBCI_GUI$FilterConstants.class
	OpenBCI_GUI/output/OpenBCI_GUI$GraphDataPoint.class
	OpenBCI_GUI/output/OpenBCI_GUI$Gui_Manager.class
	OpenBCI_GUI/output/OpenBCI_GUI$HeadPlot.class
	OpenBCI_GUI/output/OpenBCI_GUI$HelpWidget.class
	OpenBCI_GUI/output/OpenBCI_GUI$InitBox.class
	OpenBCI_GUI/output/OpenBCI_GUI$MenuList$1.class
	OpenBCI_GUI/output/OpenBCI_GUI$MenuList.class
	OpenBCI_GUI/output/OpenBCI_GUI$OpenBCI_ADS1299.class
	OpenBCI_GUI/output/OpenBCI_GUI$OutputFile_rawtxt.class
	OpenBCI_GUI/output/OpenBCI_GUI$PlaybackFileBox.class
	OpenBCI_GUI/output/OpenBCI_GUI$PlotFontInfo.class
	OpenBCI_GUI/output/OpenBCI_GUI$SDBox.class
	OpenBCI_GUI/output/OpenBCI_GUI$SDConverterBox.class
	OpenBCI_GUI/output/OpenBCI_GUI$ScatterTrace.class
	OpenBCI_GUI/output/OpenBCI_GUI$ScatterTrace_FFT.class
	OpenBCI_GUI/output/OpenBCI_GUI$SerialBox.class
	OpenBCI_GUI/output/OpenBCI_GUI$Spectrogram.class
	OpenBCI_GUI/output/OpenBCI_GUI$Table_CSV.class
	OpenBCI_GUI/output/OpenBCI_GUI$TextBox.class
	OpenBCI_GUI/output/OpenBCI_GUI.class
	OpenBCI_GUI/output/source/OpenBCI_GUI.java
merging changes
Merge branch 'chipaudette-master'
Merge pull request #2 from OpenBCI/master

From OpenBCI:master, add ChannelController