ffff
Merge branch 'master' of https://github.com/andrew51017/qubwinhackathon

Conflicts:
	TVTuner.v11.suo
	TVTuner/MainPage.xaml
	TVTuner/MainPage.xaml.cs
	TVTuner/bin/Debug/AppX/MainPage.xaml
	TVTuner/bin/Debug/AppX/TVTuner.exe
	TVTuner/bin/Debug/AppX/TVTuner.pdb
	TVTuner/bin/Debug/AppX/vs.appxrecipe
	TVTuner/bin/Debug/MainPage.xaml
	TVTuner/bin/Debug/TVTuner.exe
	TVTuner/bin/Debug/TVTuner.pdb
	TVTuner/obj/Debug/MainPage.g.cs
	TVTuner/obj/Debug/MainPage.g.i.cs
	TVTuner/obj/Debug/MainPage.xaml
	TVTuner/obj/Debug/TVTuner.exe
	TVTuner/obj/Debug/TVTuner.pdb
	TVTuner/obj/Debug/intermediatexaml/TVTuner.exe
	TVTuner/obj/Debug/intermediatexaml/TVTuner.pdb