ok
Merge branch 'master' of https://github.com/alecha/Bianconiglio

Conflicts:
	Bianconiglio/obj/Debug/Bianconiglio.csprojResolveAssemblyReference.cache
ok
Merge branch 'master' of https://github.com/alecha/Bianconiglio

Conflicts:
	Bianconiglio.v12.suo
	Bianconiglio/bin/Bianconiglio.dll
	Bianconiglio/bin/Bianconiglio.pdb
	Bianconiglio/index.html