<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
=======
>>>>>>> 6b69621ca7b67c04c4370529ed374ff23ee4c464

character_name = "John"
character_age = "35"

print ("The once was a man named " + character_name + ",")
print ("He was " + character_age + " years old.")
print ("He really liked the name " + character_name+ ",")
print ("but didn't like being " + character_age + ".")

character_age = 45
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
=======

>>>>>>> Adding new code lines


=======

character_name = "John"
character_age = "35"

print ("The once was a man named " + character_name + ",")
print ("He was " + character_age + " years old.")
print ("He really liked the name " + character_name+ ",")
print ("but didn't like being " + character_age + ".")


>>>>>>> Added first file
=======


>>>>>>> 6b69621ca7b67c04c4370529ed374ff23ee4c464
