y
Conflicts:
	battleManager.v11.suo
	battleManager/bin/WindowsGL/Debug/battleManager.exe
	battleManager/bin/WindowsGL/Debug/battleManager.pdb
	battleManager/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	battleManager/obj/x86/Debug/battleManager.exe
	battleManager/obj/x86/Debug/battleManager.pdb
git ignore added
aye
Conflicts:
	battleManager/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge branch 'master' of https://github.com/johnrich85/battleManager