fix merge

Merge branch 'master' of https://github.com/RockefellerUniversity/Intro_To_Python

# Conflicts:
#	docs/exercises/answers/Exercise1_answers.html
#	docs/exercises/answers/Exercise2_answers.html
#	docs/exercises/answers/Exercise3_answers.html
#	docs/exercises/exercises/Exercise1_exercise.html
#	docs/exercises/exercises/Exercise2_exercise.html
#	docs/exercises/exercises/Exercise3_exercise.html
#	r_course/exercises/answers/Exercise1_answers.html
#	r_course/exercises/answers/Exercise2_answers.html
#	r_course/exercises/answers/Exercise3_answers.html
#	r_course/exercises/exercises/Exercise1_exercise.html
#	r_course/exercises/exercises/Exercise2_exercise.html
#	r_course/exercises/exercises/Exercise3_exercise.html

Author: matthew-paul-2006

IntroToPython/inst/doc/Exercise1.Rmd

@@ -243,137 +243,3 @@ print(concatenate_1 + concatenate_2)
 
 ```
 
-**Exercise 5** - **Lists**
-
-- Create a list containing the values 1,2,3,4,5.
-
-```{python,echo=toMessage}
-[1,2,3,4,5]
-
-```
-- Create a list containing the values a,b,c,d,e, but assign it to a new variable called `x`.
-
-```{python,echo=toMessage}
-x = ["a","b","c","d","e"]
-x
-```
-
-- Create a list containing the values a,b,c, repeated 5 times and assign it to a new variable
-
-```{python,echo=toMessage}
-y = ["a","b","c"] * 5
-y
-```
-
-- Create a sublist with indexing. Use the variable you just created and extract the the 10th through to 15th position.
-
-```{python, echo=toMessage}
-y[9:14]
-```
-
-- With the same variable, let's use "-" indexing to get the last value of our list.
-    
-```{python, echo=toMessage}
-
-y[-1]
-
-
-```
-
-- Now print the values from [0:-1]
-    
-```{python, echo=toMessage}
-
-y[0:-1]
-
-
-```
-
-- Notice how the last value of your list is missing, even though you access it with [-1]. That's because slicing is exclusive, while indexing is inclusive. 
-    
-
-- Append the list in variable x. Add the string z.
-```{python, echo=toMessage}
-x.append('z')
-x
-```
-
-- Delete the 2nd through 6th entry of x.
-```{python, echo=toMessage}
-del(x[1:5])
-x
-```
-
-- Lets go back to variable y. Sort it in reverse order.
-```{python, echo=toMessage}
-y.sort(reverse=True)
-y
-```
-
-  
-- Multiply the y variable by 2. 
-    
-```{python, echo=toMessage}
-
-y * 2
-
-
-
-```
-    
-
-- Use the function .remove() to eliminate "a" from your list.
-    
-```{python, echo=toMessage}
-
-y.remove("a")
-
-print(y)
-
-```
-
-- Notice that .remove() eliminates only the first instance of your specified entry.
-   
-- Create a list of lists. Use the values 1,2,3,4,5, along with the lists x and y. 
-
-```{python, echo=toMessage}
-nested_list = [[1,2,3,4,5], x, y]
-nested_list
-```
-
-- Take your previous list of lists and use indexing to find the third entry of your third list.
-
-```{python, echo=toMessage}
-
-nested_list[2][2]
-
-```
-
-**Exercise 6** - **Tuples**
-
-- Create a tuple containing the values 1,2,3,4,5.
-
-```{python,echo=toMessage}
-(1,2,3,4,5)
-
-```
-
-
-- Coerce list in variable x into a tuple.
-
-```{python,echo=toMessage}
-tuple(x)
-
-```
-
-
-- Make a touple with your list of lists.
-- Print your results
-    
-```{python, echo=toMessage}
-
-nested_list_tuple = tuple(nested_list)
-
-print(nested_list_tuple)
-
-```