Merge branch 'master' into microchannel
added microchannel pressure plots
Merge branch 'master' into microchannel
changed socket
added microDisplay
new display program for microchannel data
Merge branch 'master' into microchannel
Merge branch 'microchannel'
add subdir
new versions
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master' into microchannel
Merge branch 'master' into microchannel
Merge pull request #29 from Negusbuk/master

various fixes and cleanups