Subiendo
Merge branch 'master' of /home/dragon/Projects/hackitdo with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Subiendo