debug stuff
binary file
Merge branch 'master' of https://github.com/jamesej/lynicon-core.git
debugfiles
Merge branch 'master' of https://github.com/jamesej/lynicon-core.git

Conflicts:
	bin/Debug/Lynicon.dll
	bin/Debug/Lynicon.pdb
	obj/Debug/Lynicon.csproj.FileListAbsolute.txt
	obj/Debug/Lynicon.csprojResolveAssemblyReference.cache
	obj/Debug/Lynicon.dll
	obj/Debug/Lynicon.pdb
guff
Merge branch 'master' of https://github.com/jamesej/lynicon-core.git
Merge branch 'master' of https://github.com/jamesej/lynicon-core.git
Merge branch 'master' of https://github.com/jamesej/lynicon-core.git
Merge branch 'master' of https://github.com/jamesej/lynicon-core.git
Merge branch 'master' of https://github.com/jamesej/lynicon-core.git
sada
Merge branch 'master' of https://github.com/jamesej/lynicon-core.git

Conflicts:
	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Reference.cache
Merge branch 'master' of https://github.com/jamesej/lynicon-core.git
Merge branch 'master' of https://github.com/jamesej/lynicon-core.git
Merge branch 'master' of https://github.com/jamesej/lynicon-core.git
Merge branch 'master' of https://github.com/jamesej/lynicon-core.git
Merge branch 'master' of https://github.com/jamesej/lynicon-core.git
Merge branch 'master' of https://github.com/jamesej/lynicon-core.git