Small updates
BugFix: OsciConnection.cs is now included
Merge branch 'master' of https://github.com/teamalpha5441/KAMI

Conflicts:
	src/KAMI/KAMI.csproj
	src/KAMI/OsciConnection.cs
	src/KAMI/Program.cs