Included String Context
Merge branch 'master' of https://github.com/rrbemo/CIS345Final

Conflicts:
	cis345finalapplication/cis345finalapplication/MainWindow.xaml