Removed userstate which should be ignored by git
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' into jp485
Merge remote-tracking branch 'upstream/master' into jp485
Finished appropriate functionality for recommended sample interval
Merged application to fix conflicts
Started adding framework for queue saving
Finished making DataSet object, new problem is figuring out how arc works
Hopefully fixed merge conflicts