my first commit
erge
resolvi conflicto en git ignore