gitignore merge conflict
gitignore merge conflict

mkcode/classroom,hackerkid/classroom,mkcode/classroom,BelieveC/classroom,BelieveC/classroom,ConnorCartwright/classroom,ConnorCartwright/classroom,hackerkid/classroom,mkcode/classroom,ConnorCartwright/classroom,BelieveC/classroom,hackerkid/classroom,BelieveC/classroom