kithlay, maxigauge, coolpak6000 with inputoutput
Merge pull request #13 from irinabrodski/unstable

kithlay, maxigauge, coolpak6000 with inputoutput
Cleaned up. Directories procedural created externalLibraries, build must not be added to git
Added a .gitignore
all connections with inputoutput
Conflict resolution
Merge branch 'irinabrodski-unstable' into unstable
Merge branch 'unstable' of https://github.com/irinabrodski/lughos into irinabrodski-unstable

Conflicts:
	.kdev4/lughos.kdev4
	build/CMakeFiles/test_connections.dir/CXX.includecache
	build/CMakeFiles/test_connections.dir/src/MaxiGauge.cpp.o
	build/CMakeFiles/test_connections.dir/src/coolpak6000.cpp.o
	build/CMakeFiles/test_connections.dir/src/kithleighSerial.cpp.o
	build/CMakeFiles/test_connections.dir/src/serialAsync.cpp.o
	build/CMakeFiles/test_connections.dir/src/serialConnections.cpp.o
	build/CMakeFiles/test_connections.dir/src/serialSync.cpp.o
	build/CMakeFiles/test_connections.dir/src/test_serial.cpp.o
	build/test_connections
Merge branch 'irinabrodski-unstable' into unstable
valgrind said its fine.
PSANetzteil
Conflict solved.
Merge branch 'irinabrodski-unstable' into unstable
Merge branch 'unstable' of https://github.com/jmankiewicz/lughos into jmankiewicz-unstable

Conflicts:
	.kdev4/lughos.kdev4
	CMakeLists.txt
Merge branch 'jmankiewicz-unstable' into unstable
Externalized dependency-building and -packaging.
Merge branch 'unstable' of github.com:jmankiewicz/lughos into unstable

Conflicts:
	CMakeLists.txt
Cleanup