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

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