Modifications on SQUID Control
Merge branch 'master' of https://github.com/mne-tools/mne-cpp
Lots of changes - currently not working
test for changing branch.
Merge pull request #46 from liminsun/master

Test for merging