Adiantando... hehehe
Merge branch 'master' of https://github.com/bonifacio/AFNDforAFD

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/bonifacio/AFNDforAFD
---
---