Comit inicial de including
Merge branch 'master' of https://github.com/ggiudice/including

Conflicts:
	.gitignore