Merge branch 'master' of https://github.com/ktrops/RubyFall2014

to merge
Conflicts:
	week2/homework/questions.txt
	week2/homework/simon_says_spec.rb

Author: ktrops

week2/homework/questions.txt

@@ -17,4 +17,8 @@ A module is a collection of constants and methods. Enumerable has methods used f
 A class can only inherit from one parent class, but by using Mixin Modules you can simulate multiple inheritance. 
 
 5. What is the difference between a Module and a Class?
+<<<<<<< HEAD
 Modules you can use across multiple classes. Modules are about functions and constants and classes are about objects and instances. 
+=======
+Modules you can use across multiple classes. Modules are about functions and constants and classes are about objects and instances.
+>>>>>>> 500e6f9d77bbce46d757bf3757289e7e5b1b69ae

week2/homework/simon_says.rb

@@ -0,0 +1,28 @@
+class SimonSays
+  def echo answer
+    puts answer
+  end
+  def shout phrase
+    puts phrase.upcase
+    end
+  def repeat (text, num)
+    if num == nil 
+      num = 1
+      num.times do
+        puts text
+      end
+    else
+      num.times do 
+        puts text
+      end 
+    end
+  end
+   def start_of_word(text, num)
+     index = num - 1
+     puts text[0..index]
+
+   end 
+   def first_word(text)
+     puts text.split(' ').first
+   end   
+end