added and modified listbox1
modification and sync issues
Merge branch 'master' of https://github.com/tankcr/ROD

Conflicts:
	ROD Deck Builder/Form1.cs
	ROD Deck Builder/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ROD Deck Builder/obj/Debug/ROD Deck Builder.csproj.FileListAbsolute.txt
	ROD Deck Builder/obj/Debug/ROD Deck Builder.csproj.GenerateResource.Cache
	ROD Deck Builder/obj/Debug/ROD Deck Builder.exe
	ROD Deck Builder/obj/Debug/ROD Deck Builder.pdb
	ROD Deck Builder/obj/Debug/ROD_Deck_Builder.Form1.resources
	ROD Deck Builder/obj/Debug/ROD_Deck_Builder.Properties.Resources.resources