Oops
Revert "Oops"

This reverts commit f1b040c8d419691e24279620e3f4ccbc7d1a3921.
stuff
Merge branch 'dev' into dev-Andreas
fix
fix
fix fix
remove stuff
stuff
actually added a title for the window
Recoding to wpf for AWSOMENESS!
more wpf
more design
commit
fix
update gitignore
Merge pull request #5 from Northcode/dev-Andreas

Dev andreas
merge
Merge branch 'dev'

Conflicts:
	.gitignore
	MCM-reboot/Form1.Designer.cs
	MCM-reboot/MCM-reboot.v11.suo
	MCM-reboot/bin/Debug/MCM-reboot.exe
	MCM-reboot/bin/Debug/MCM-reboot.pdb
	MCM-reboot/obj/Debug/MCM-reboot.exe
	MCM-reboot/obj/Debug/MCM-reboot.pdb
	MCM-wpf/App.config
	MCM-wpf/App.xaml
	MCM-wpf/App.xaml.cs
	MCM-wpf/MCM-wpf.csproj
	MCM-wpf/MainWindow.xaml
	MCM-wpf/MainWindow.xaml.cs
	MCM-wpf/Properties/Resources.Designer.cs
	MCM-wpf/Properties/Settings.Designer.cs
	MCM-wpf/bin/Debug/MC Manager.exe.config
	MCM-wpf/bin/Debug/MC Manager.vshost.exe
	MCM-wpf/bin/Debug/MCM-wpf.vshost.exe.config
	MCM-wpf/obj/Debug/MCM-wpf.csproj.GenerateResource.Cache
Merge pull request #8 from Northcode/master

Pull