d

d
Merge remote-tracking branch 'origin/master'

Conflicts:
	Nigga/Nigga.v12.suo
	Nigga/Nigga/AboutWindow.xaml
	Nigga/Nigga/bin/Debug/Nigga.exe
	Nigga/Nigga/bin/Debug/Nigga.pdb
	Nigga/Nigga/obj/Debug/AboutWindow.baml
	Nigga/Nigga/obj/Debug/AboutWindow.g.i.cs
	Nigga/Nigga/obj/Debug/MainWindow.baml
	Nigga/Nigga/obj/Debug/Nigga.exe
	Nigga/Nigga/obj/Debug/Nigga.g.resources
	Nigga/Nigga/obj/Debug/Nigga.pdb
	Nigga/Nigga/obj/Debug/Window/AboutWindow.g.i.cs
	Nigga/Nigga/obj/Debug/Window/MainWindow.g.i.cs