ultimos avances
Merge branch 'master' of https://github.com/andrezinho/md

Conflicts:
	index.php
	nbproject/project.properties