Updated johnny
Added some other file
updated
updated again
Made some more updates
Fixed conflict in some_other_file.txt
Changed some_other_file to include Aron