Part of the basic skeleton.
Merge branch 'master' of github.com:CDeCuadrante/CDeCuadrante