octavo commit
Merge branch 'master' of https://github.com/ggderas/example

Conflicts:
	aplicacion/aplicacion/Clase.cs