Moved questions around

smirza3 · smirza3 · commit ffcd36cc5a8a · 2020-06-07T16:30:06.000+01:00
diff --git a/session_10/answers/A5.py b/session_10/answers/A5.py
@@ -1,5 +1,3 @@
-
-# 5. Create the instance attributes fullname and email in the Employee class. Given a person's first and last names:
-#  - Form the fullname by simply joining the first and last name together, separated by a space.
-#  - Form the email by joining the first and last name together with a . in between, and follow it with @company.com at the end. Make sure everything is in lowercase.
+# 5. Write a class which has two methods get_word and print_word. 
+#  - get_word accepts a string from the user and print_word prints the string in upper case. 
 
diff --git a/session_10/answers/A6.py b/session_10/answers/A6.py
@@ -1,3 +1,9 @@
-# 6. Write a class which has two methods get_word and print_word. 
-#  - get_word accepts a string from the user and print_word prints the string in upper case. 
+# 6. Create a Sandwich class with the attributes order_number and ingredients (which is given as a list). 
+#  - Only the ingredients will be given as input.
 
+# You should also make it possible to choose a ready-made sandwich rather than typing out the ingredients manually. Also hard-code the following sandwich flavours.
+
+# Name	Ingredients
+# vegan_hot	vegan cheese, meatless meatballs, jalapenos
+# meat_festival	steak, peppers, cheese
+# garden_feast	spinach, olives, mushroom, eggs
diff --git a/session_10/answers/A7.py b/session_10/answers/A7.py
diff --git a/session_10/exercises/exercises_10.md b/session_10/exercises/exercises_10.md
@@ -27,14 +27,10 @@
      - iii. Delete the wheels.
 
 
-5. Create the instance attributes fullname and email in the Employee class. Given a person's first and last names:
- - Form the fullname by simply joining the first and last name together, separated by a space.
- - Form the email by joining the first and last name together with a . in between, and follow it with @company.com at the end. Make sure everything is in lowercase.
-
-6. Write a class which has two methods get_word and print_word. 
+5. Write a class which has two methods get_word and print_word. 
  - get_word accepts a string from the user and print_word prints the string in upper case. 
 
-7. Create a Sandwich class with the attributes order_number and ingredients (which is given as a list). 
+6. Create a Sandwich class with the attributes order_number and ingredients (which is given as a list). 
  - Only the ingredients will be given as input.
 
 You should also make it possible to choose a ready-made sandwich rather than typing out the ingredients manually. Also hard-code the following sandwich flavours.
