Added TODO-file
Added php-files and css-file
Edited files
Edited some files ...
updated files
Merge branch 'master' into oni.AddingPHPFiles
Moved PHP files
Implemented Hardcopy
Updated files
Added jQuery files
Edited some files
Printing tested and working
Added Osci-Class
Merge branch 'master' into fan.processing

Conflicts:
	src/KAMI/KAMI.csproj
Started using Osci-Connection
Added OsciConnection
Merge branch 'master' into 'fan.processing'

Needing current version of "OsciConnection"
Added OsciConnection (This Time for real! )
Merge branch 'master' into fan.processing

Mergin 'cause of needed file
Edited some things