acasa
Merge branch 'master' of https://github.com/GabyAMP/Public

Conflicts:
	WindowsFormsApplication2-1/Book1.xls
Merge branch 'master' of https://github.com/GabyAMP/Public

Conflicts:
	WindowsFormsApplication2-1/WindowsFormsApplication2/Form1.Designer.cs
	WindowsFormsApplication2-1/WindowsFormsApplication2/Form1.cs
	WindowsFormsApplication2-1/WindowsFormsApplication2/WindowsFormsApplication2.csproj