stuffing staff stuff
Merge branch 'master' of github.com:introsuit/Fidels

Conflicts:
	Fidels/MainWindow.xaml.cs
	Fidels/Service.cs