Intentando reparar
aaa
asdf
Merge branch 'master' of https://github.com/sikloidz/Planeacion

Conflicts:
	.gitignore