Merge remote-tracking branch 'origin/master'

# Conflicts:
#	63-1JN/02.usfm

05-DEU/03.usfm

@@ -40,7 +40,7 @@
 \v 16 I allotted to the tribes of Reuben and Gad the southern part of Gilead, extending south to the Arnon River. The middle of the river is the southern boundary. The northern boundary is the Jabbok River, which is part of the border of region of Ammon.
 
 \s5
-\v 17 The border extends from the plain along the east side of the Jordan valley, from Kinnereth in the north (known as the sea of Galilee), to the sea of Arabah (known as the Dead Sea) in the south, and to the slopes of Mount Pisgah on the east.
+\v 17 The border extends from the plain along the east side of the Jordan valley, from Kinnereth in the north (known as the Sea of Galilee), to the sea of Arabah (known as the Dead Sea) in the south, and to the slopes of Mount Pisgah on the east.
 
 \s5
 \p

11-1KI/15.usfm

@@ -46,7 +46,7 @@
 \v 19 "I want there to be a peace treaty between me and you, like there was between my father and your father. For that purpose, I am giving you this silver and gold. So now please cancel the treaty that you made with Baasha, the king of Israel, in order that he will take his soldiers away from attacking mine, because he will be afraid of your army."
 
 \s5
-\v 20 So the officials went and gave the message to Ben Hadad, and he did what Asa suggested. He sent his army commanders and their soldiers to attack some of the towns in Israel. They captured Ijon, Dan, Abel Beth Maacah, the area near the sea of Galilee, and all the land of the tribe of Naphtali.
+\v 20 So the officials went and gave the message to Ben Hadad, and he did what Asa suggested. He sent his army commanders and their soldiers to attack some of the towns in Israel. They captured Ijon, Dan, Abel Beth Maacah, the area near the Sea of Galilee, and all the land of the tribe of Naphtali.
 \v 21 When Baasha heard about that, he told his soldiers to stop working at Ramah. He and his soldiers returned to Tirzah and stayed there.
 \v 22 Then King Asa sent a message to all the people in the towns in Judah, stating that they all were required to go to Ramah and carry away the stones and timber that Baasha's soldiers had been using to build a wall around the city. With those stones and timber they fortified the city of Mizpah north of Jerusalem, and Geba, a town in the territory of the tribe of Benjamin.
 

11-1KI/20.usfm

@@ -68,7 +68,7 @@
 \p Ben Hadad agreed with them, and he did what they suggested.
 
 \s5
-\v 26 In the spring of the following year, he gathered his soldiers and marched with them to the city of Aphek east of the sea of Galilee, to fight against the Israelite army.
+\v 26 In the spring of the following year, he gathered his soldiers and marched with them to the city of Aphek east of the Sea of Galilee, to fight against the Israelite army.
 \v 27 The Israelite army was also gathered together, and they were given the things that they needed for the battle. Then they marched out and formed two groups facing the Aramean army. Their army was very small. They resembled two small flocks of goats, whereas the Aramean army was very large and spread all over the countryside.
 
 \s5

41-MAT/04.usfm

@@ -50,7 +50,7 @@
 
 \s5
 \p
-\v 18 One day while Jesus was walking by the sea of Galilee, he saw two men, Simon, who was later called Peter, and Andrew, his younger brother. They were casting their fishing net into the water because they earned money by catching and selling fish.
+\v 18 One day while Jesus was walking by the Sea of Galilee, he saw two men, Simon, who was later called Peter, and Andrew, his younger brother. They were casting their fishing net into the water because they earned money by catching and selling fish.
 \v 19 Jesus said to them, "Come with me and I will teach you how to gather people to become my disciples. It will be just like you have been fishing." 
 \v 20 They immediately left the work that they were doing and went with him.
 

41-MAT/08.usfm

@@ -48,7 +48,7 @@
 
 \s5
 \p
-\v 23 Then Jesus and his disciples got into the boat, and they started sailing around the sea of Galilee.
+\v 23 Then Jesus and his disciples got into the boat, and they started sailing around the Sea of Galilee.
 \v 24 Suddenly strong winds blew on the water, and very high waves were splashing into the boat and filling it. But Jesus was sleeping.
 \v 25 They went and woke him up, and said to him, "Lord, rescue us! We are about to drown!"
 

41-MAT/13.usfm

@@ -3,7 +3,7 @@
 \s5
 \c 13
 \p
-\v 1 That same day Jesus, along with the disciples, left the house where he was teaching and went to the shore of the sea of Galilee. He sat down there,
+\v 1 That same day Jesus, along with the disciples, left the house where he was teaching and went to the shore of the Sea of Galilee. He sat down there,
 \v 2 and a very large crowd gathered around him to listen to him teach. In order to have a little room, he got into a boat and sat down to teach them. The crowd stood on the shore and listened to him.
 
 \s5

41-MAT/14.usfm

@@ -25,7 +25,7 @@
 \v 12 Later John's disciples went to the prison, took John's body and buried it. Then they went and told Jesus what had happened.
 
 \s5
-\v 13 After Jesus heard that news, he took just the disciples with him and went by boat on the sea of Galilee to a place where no one lived.
+\v 13 After Jesus heard that news, he took just the disciples with him and went by boat on the Sea of Galilee to a place where no one lived.
 \p After the crowds heard about where they had gone, they left their towns and followed them, walking along the shore.
 \v 14 When Jesus came to the shore, he saw a very large crowd waiting for him. He felt sorry for them, and he healed the sick people who were among them.
 
@@ -45,7 +45,7 @@
 
 \s5
 \p
-\v 22 Right after that happened, Jesus told the disciples to get in the boat and to go ahead of him to the other side of the sea of Galilee. In the meantime, he was going to send the crowd home. 
+\v 22 Right after that happened, Jesus told the disciples to get in the boat and to go ahead of him to the other side of the Sea of Galilee. In the meantime, he was going to send the crowd home. 
 \v 23 After he sent the crowd away, he went up into the hills to pray by himself. When it was evening, he was still there alone.
 \v 24 By this time the disciples were a long distance from the shore. The wind was blowing very hard opposite to how the disciples were trying to sail; the wind made very large waves that were tossing the boat back and forth in the water.
 

41-MAT/15.usfm

@@ -56,7 +56,7 @@
 
 \s5
 \p
-\v 29 Then Jesus and his disciples went away from that area, back to the sea of Galilee. Then Jesus climbed the hill near there and sat down to teach the people.
+\v 29 Then Jesus and his disciples went away from that area, back to the Sea of Galilee. Then Jesus climbed the hill near there and sat down to teach the people.
 \v 30 Large crowds kept coming to him for the next two days and brought lame, crippled, and blind people, those who were unable to talk, and many others who had various sicknesses. They laid them in front of Jesus so that he would heal them. And he healed them.
 \v 31 The crowd saw him heal people who could not talk, crippled people, lame people, and blind people, and they were amazed. They said, "Praise God who rules over us in Israel!"
 

41-MAT/16.usfm

@@ -12,7 +12,7 @@
 
 \s5
 \p
-\v 5 They all sailed to the other side of the sea of Galilee. Then the disciples realized that they had forgotten to take anything to eat with them.
+\v 5 They all sailed to the other side of the Sea of Galilee. Then the disciples realized that they had forgotten to take anything to eat with them.
 \v 6 At that point, Jesus said to them, "Be careful not to accept the yeast that the Pharisees and Sadducees want to give you."
 \v 7 They tried to make sense out of what Jesus had told them, and they said to each other, "He must have said that because we forgot to bring anything to eat!"
 \v 8 But Jesus knew what they were saying and answered them, "I am disappointed that you think it was because you forgot bring bread that I talked about the yeast of the Pharisees and Sadducees. You believe only a little what I am able to do for you.

41-MAT/17.usfm

@@ -52,7 +52,7 @@
 
 \s5
 \v 26 Peter answered him, "From citizens of other countries." Then Jesus said to him, "So citizens of their own country do not need to pay taxes.
-\v 27 But go ahead and pay the tax for us so that the temple tax collectors will not become angry with us. In order to get the money to pay it, go to the sea of Galilee, cast your fish line and hook, and take the first fish that you catch. When you open its mouth, you will find a silver coin that is worth enough to pay the tax for you and me. Take that coin and give it to the temple tax collectors."
+\v 27 But go ahead and pay the tax for us so that the temple tax collectors will not become angry with us. In order to get the money to pay it, go to the Sea of Galilee, cast your fish line and hook, and take the first fish that you catch. When you open its mouth, you will find a silver coin that is worth enough to pay the tax for you and me. Take that coin and give it to the temple tax collectors."
 
 
 

42-MRK/01.usfm

@@ -37,7 +37,7 @@
 
 \s5
 \p
-\v 16 One day, while Jesus was walking along by the sea of Galilee, he saw two men, Simon and Simon's brother, Andrew. They were casting their fishing net into the sea. They earned money by catching and selling fish.
+\v 16 One day, while Jesus was walking along by the Sea of Galilee, he saw two men, Simon and Simon's brother, Andrew. They were casting their fishing net into the sea. They earned money by catching and selling fish.
 \v 17 Then Jesus said to them, "Just like you have been gathering fish, come with me and I will teach you how to gather people."
 \v 18 Immediately they left their nets, and they went with him.
 

42-MRK/02.usfm

@@ -26,7 +26,7 @@
 
 \s5
 \p
-\v 13 Jesus left Capernaum and walked along the shore of the sea of Galilee. A large crowd came to him and he taught them.
+\v 13 Jesus left Capernaum and walked along the shore of the Sea of Galilee. A large crowd came to him and he taught them.
 \v 14 As he walked, he saw a man named Levi whose father's name was Alpheus. He was sitting in his office where he collected taxes. Jesus said to him, "Come with me."  He got up and went with Jesus.
 
 \s5

42-MRK/03.usfm

@@ -16,7 +16,7 @@
 
 \s5
 \p
-\v 7 Jesus and his disciples left that town and went to an area further along the sea of Galilee. A great crowd of people followed him. The people that followed him came from Galilee and Judea,
+\v 7 Jesus and his disciples left that town and went to an area further along the Sea of Galilee. A great crowd of people followed him. The people that followed him came from Galilee and Judea,
 \v 8 from Jerusalem, from towns in the district of Judea, from the district of Idumea, from the region on the east side of the Jordan River, and from the region around the cities of Tyre and Sidon. They all came to him because they had heard about what he was doing.
 
 \s5

42-MRK/04.usfm

@@ -3,7 +3,7 @@
 \s5
 \c 4
 \p
-\v 1 Another time Jesus began to teach people alongside the sea of Galilee. As he was teaching, a very large crowd gathered around him. He got into a boat and pushed out onto the water. Then he sat down in the boat so that he could speak to the crowd better. At the same time, the crowd was on the shore close to the water.
+\v 1 Another time Jesus began to teach people alongside the Sea of Galilee. As he was teaching, a very large crowd gathered around him. He got into a boat and pushed out onto the water. Then he sat down in the boat so that he could speak to the crowd better. At the same time, the crowd was on the shore close to the water.
 \v 2 Then he taught them many parables. While he was teaching them, he told them this:
 
 \s5

42-MRK/06.usfm

@@ -88,7 +88,7 @@
 
 \s5
 \p
-\v 45 Right away Jesus told his disciples to get into the boat and then go ahead of him to Bethsaida, which was further around the sea of Galilee. He stayed and dismissed the many people who were there.
+\v 45 Right away Jesus told his disciples to get into the boat and then go ahead of him to Bethsaida, which was further around the Sea of Galilee. He stayed and dismissed the many people who were there.
 \v 46 After he said goodbye to the people, he went up into the hills in order to pray.
 \v 47 When it was evening, the disciples' boat was in the middle of the lake, and Jesus was by himself on the land.
 
@@ -103,7 +103,7 @@
 
 \s5
 \p
-\v 53 After they went further around the sea of Galilee in a boat, they came to shore at Gennesaret. Then they fastened the boat there.
+\v 53 After they went further around the Sea of Galilee in a boat, they came to shore at Gennesaret. Then they fastened the boat there.
 \v 54 As soon as they got out of the boat, the people there recognized Jesus.
 \v 55 So they ran throughout the whole district in order to tell others that Jesus was there. Then the people placed those who were sick on stretchers and carried them to any place where they heard people say that Jesus was.
 

42-MRK/07.usfm

@@ -69,7 +69,7 @@ For example, they refuse to eat until they first wash their hands with a special
 
 \s5
 \p
-\v 31 Jesus and his disciples left the region around Tyre and went north through Sidon, then toward the east through the area of the Ten Towns, and then south to the towns near the sea of Galilee.
+\v 31 Jesus and his disciples left the region around Tyre and went north through Sidon, then toward the east through the area of the Ten Towns, and then south to the towns near the Sea of Galilee.
 \v 32 There, people brought to him a man who was deaf and could not talk. They begged Jesus to lay his hands on him in order to heal him.
 
 \s5

42-MRK/08.usfm

@@ -18,13 +18,13 @@
 \v 7 They had also found that they had a few small fish. So after he thanked God for these, he told the disciples, "Distribute these also." After they distributed the fish to the crowd,
 \v 8 the people ate this food, and they had plenty to satisfy themselves. The disciples collected the pieces of food that were left over and filled seven large baskets.
 \v 9 The disciples estimated that there were about four thousand people who ate on that day. Then Jesus dismissed the crowd.
-\v 10  Immediately after that, he got into the boat along with his disciples, and they went around the sea of Galilee to the district of Dalmanutha.
+\v 10  Immediately after that, he got into the boat along with his disciples, and they went around the Sea of Galilee to the district of Dalmanutha.
 
 \s5
 \p
 \v 11 Then some Pharisees came to Jesus. They began arguing with him and insisting that he perform a miracle to show that God had sent him.
 \v 12 Jesus sighed deeply within himself, and then he said, "Why are you asking me to perform a miracle?  I will not do a miracle for you!"
-\v 13 Then he left them. He got into the boat again, along with his disciples, and they went further around the sea of Galilee.
+\v 13 Then he left them. He got into the boat again, along with his disciples, and they went further around the Sea of Galilee.
 
 \s5
 \v 14 The disciples had forgotten to bring along enough food. Specifically, they had only one flat loaf of bread with them in the boat.

44-JHN/06.usfm

@@ -3,7 +3,7 @@
 \s5
 \c 6
 \p
-\v 1 Jesus went across the lake to the other side. The name of the lake was the "sea of Galilee" to some people; other people called it the "Sea of Tiberias."
+\v 1 Jesus went across the lake to the other side. The name of the lake was the "Sea of Galilee" to some people; other people called it the "Sea of Tiberias."
 \v 2 A large crowd followed him because they had seen the wonders he had done in healing people who were very sick. 
 \v 3 Jesus went up on a steep hillside and sat down with his disciples.
 
@@ -30,7 +30,7 @@
 
 \s5
 \p
-\v 16 When it was evening, his disciples went down to the sea of Galilee,
+\v 16 When it was evening, his disciples went down to the Sea of Galilee,
 \v 17 got into a boat, and started to sail across the sea to the city of Capernaum. It was now dark, and Jesus was not with them.
 \v 18 A strong wind started to blow, and the waves on the sea became very rough.
 
@@ -47,7 +47,7 @@
 \s5
 \v 24 When the crowd realized that neither Jesus nor his disciples were there, some of them got into those boats and sailed to Capernaum to find Jesus.
 \p
-\v 25 They searched and found Jesus in Capernaum on the other side of the sea of Galilee. They asked him, "Teacher, when did you come here?"
+\v 25 They searched and found Jesus in Capernaum on the other side of the Sea of Galilee. They asked him, "Teacher, when did you come here?"
 
 \s5
 \v 26 Jesus replied to them, "I am telling you the truth: you are not looking for me because you saw me perform miracles that show who I am. No! You are looking for me only because you ate until you were full of the loaves of bread.

44-JHN/21.usfm

@@ -3,7 +3,7 @@
 \s5
 \c 21
 \p
-\v 1 After that, Jesus appeared to the disciples by Lake Tiberias (also known as the sea of Galilee). He made himself known in this way:  
+\v 1 After that, Jesus appeared to the disciples by Lake Tiberias (also known as the Sea of Galilee). He made himself known in this way:  
 \v 2 Simon Peter, Thomas (called The Twin), Nathaniel of Cana in Galilee, the sons of Zebedee (James and John), and two other disciples, were together.
 \v 3 Simon Peter said to the others, "I am going fishing." They said, "We will go with you." They went out and got into the boat, but that night they caught nothing.
 

56-2TI/02.usfm

@@ -4,7 +4,7 @@
 \c 2
 \p
 \v 1 You are like a son to me. So I urge also that you let God empower you as a result of Christ Jesus acting kindly toward you.
-\v 2 Command faithful men to teach the things you heard from me and from many others who have testified in the same way to others, too. 
+\v 2 Command and trust faithful men to teach the things you heard from me and from many others who have testified in the same way to others, too. 
 
 \s5
 \p
@@ -42,7 +42,7 @@ for he cannot deny himself."
 \p
 \v 16 Stay away from people who talk in ways that insult God, because this kind of talk dishonors God more and more.
 \v 17 This kind of words will spread like an infectious disease. Hymenaeus and Philetus are two examples of men who talk like this.
-\v 18 These men have wandered away from the truth, saying the resurrection of the dead  has already happened. In this way they upset the faith of some believers. 
+\v 18 These men have stopped believing. They say that the resurrection of the dead has already happened. In this way they convince some Christians to stop trusting in Christ. 
 
 \s5
 \v 19 However, the truth about God still exists. It is like a firm foundation of a building, on which someone has written these words: "The Lord knows those who belong to him," and, "Everyone who says he belongs to the Lord must stop doing wicked deeds."

63-1JN/02.usfm

@@ -30,7 +30,11 @@
 
 \s5
 \p
+<<<<<<< HEAD
 \v 15 Do not behave like the people in the world who do not honor God. Do not desire the things  they want to have. If anyone lives like they live, they are proving they do not love God our Father.
+=======
+\v 15 Do not behave like the people in the world who do not honor God. Do not desire the things they want to have. If anyone lives like they live, they are proving they do not love God our Father.
+>>>>>>> origin/master
 \v 16 I write this, because all the wrong things that people do, all the things that people see and try to obtain for themselves, and all the things that they boast about—all these things have nothing to do with our Father in heaven. They belong to the world.
 \v 17 The people in the world who do not honor God, along with everything that they desire, will disappear. But those who do what God wants them to do will live forever!
 
@@ -40,7 +44,7 @@
 \v 19 These  people refused to remain in our congregations, but they never really belonged with us in the first place. When they left us, we clearly saw that they had never joined with us.
 
 \s5
-\v 20 But as for you, Christ, the one who is holy, has given his Spirit; it is his Spirit who teaches you all the truth.
+\v 20 But as for you, Christ, the one who is holy, has given you his Spirit; it is his Spirit who teaches you all the truth.
 \v 21 I am writing this letter to you, not because you do not know the truth about God, but because you do know what it is. You also know that God teaches us nothing that is false; instead, he teaches us only what is true.
 
 \s5

63-1JN/03.usfm

@@ -9,11 +9,11 @@
 \s5
 \v 4 But everyone who continues to sin is refusing to obey God's laws, because that is what sin is, refusing to obey God's laws.
 \v 5 You know that Christ came in order to completely remove the guilt of our sins. You know also that he never sinned.
-\v 6 Those who continue doing what Christ wants them to, do not continue sinning repeatedly. But those who repeatedly sin have not understood who Christ is, nor have they truly joined with him.
+\v 6 Those who continue doing what Christ wants them to do, do not continue sinning repeatedly. But those who repeatedly sin have not understood who Christ is, nor have they truly joined with him.
 
 \s5
-\v 7 So I urge you, who are very dear to me, do not let anyone deceive you by telling you that it is all right to sin. If you continue doing what is right, you are righteous, just like Christ is righteous.
+\v 7 So I urge you who are very dear to me, do not let anyone deceive you by telling you that it is all right to sin. If you continue doing what is right, you are righteous, just like Christ is righteous.
-\v 8 But if anyone continues to sin repeatedly, he is like the devil, because the devil has always been sinning since the world  began. And the reason why God's Son became a human being was to destroy what the devil has done.
+\v 8 But anyone who continues to sin repeatedly is like the devil, because the devil has always been sinning since the world began. And the reason why God's Son became a human being was to destroy what the devil has done.
 
 \s5
 \v 9 People do not continue sinning repeatedly if they have become children of God. They cannot continually sin because God has made them his children, and he has put into them what he himself is like.
@@ -21,13 +21,13 @@
 
 \s5
 \p
-\v 11 The message that you heard when you first  believed in Christ is that we should love each other.
+\v 11 The message that you heard when you first believed in Christ is that we should love each other.
 \v 12 We should not hate others as did Adam's son, Cain, who belonged to Satan, the evil one. Because Cain hated his younger brother, he murdered him. I will tell you about why he murdered his brother. It was because Cain habitually behaved in an evil way, and he hated his younger brother because his younger brother behaved in the right way.
 
 \s5
 \v 13 You should not be amazed when unbelievers hate you.
-\v 14 We know that God has made us to live forever with him, because we love our fellow believers. But God regards anyone who does not love them as dead.
+\v 14 Because we love our fellow believers, we know that God has made us to live forever with him. But God regards anyone who does not love them as dead.
-\v 15 Those who hate any of their fellow believers, God considers  them to be murderers. And you know that no murderer has eternal life.
+\v 15 God considers those who hate any of their fellow believers to be murderers. And you know that no murderer has eternal life.
 
 \s5
 \v 16 The way that we now know how to truly love our fellow believers is by remembering that Christ died for us of his own free will. So in the same way, we should do anything for our fellow believers, even die for them.