-- Base class added
jj
Merge branch 'master' of https://github.com/andrew51017/qubwinhackathon

Conflicts:
	TVTuner.v11.suo
	TVTuner/TVTuner.csproj