my first commit is amazing
Text edited, lines added and removed
first commit to the new branch with some text edit
I changed the master
Merge with fixed conflicts
added my food order to a file
merge