final pull request?

test_gem/dp_test_gem.gemspec

@@ -0,0 +1,11 @@
+Gem::Specification.new do |s|
+  s.name        = 'dp_test_gem'
+  s.version     = '0.0.1'
+  s.date        = '2012-11-19'
+  s.summary     = 'gettin crazy with test gems'
+  s.description = 'a tool to help me understand gem creation'
+  s.authors     = ["danny pham"]
+  s.email       = 'pham.danny.t@gmail.com'
+  s.homepage    = 'http://rubygems.org/gems/test_gem'
+  s.files       = ["lib/dp_test_gem.rb"]
+end

test_gem/lib/dp_test_gem.rb

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+puts "hello gem!"

week1/homework/questions.txt

@@ -1,3 +1,19 @@
+<<<<<<< HEAD
+1. What is an object? 
+An object is an instance of a class
+2. What is a variable? 
+With Ruby, it is a reference to an object
+3. What is the difference between an object and a class? 
+an object is a specific creation of related state and behavior created with the blueprint, or its class
+4. What is a String? 
+String is a class so a string is an instance of String. A string represents text.
+5. What are three messages that I can send to a string object? Hint: think methods  
+dup, freeze,  [](0)
+6. What are two ways of defining a String literal? 
+with single quotations and with double quotations
+Bonus: What is the difference between the two? 
+double quotations allow for interpolation and more escape sequences
+=======
 Please read: 
 Chapter 3 Classes, Objects, and Variables 
 p.90-94 Strings
@@ -22,3 +38,4 @@ split  - returns an array of strings made up of the original string separated on
 6. What are two ways of defining a String literal? Bonus: What is the difference between the two?
 Single quotes ex: '' and Double quotes ex: "". The single qoutes allow for 2 escape characters: \' and \\ . The double qouted string literal allows for many different escaped special characters (like \n is a line break) and allows for string interpolation, or the injection of evaluated Ruby code into the string ex: "Hello #{my_name}". The single qouted string takes up much less memory than a doulbe qouted string with interpolation. Without interpolation, both are about the same.
 
+>>>>>>> 476e4b543ee68aad8bb809afdfe2207afd39e8e5

week1/homework/strings_and_rspec_spec.rb

@@ -13,6 +13,18 @@
 			@my_string = "Renée is a fun teacher. Ruby is a really cool programming language"
 		end
 		it "should be able to count the charaters" do
+<<<<<<< HEAD
+                        count = @my_string.length
+			count.should eq @my_string.length.size	
+		end
+		it "should be able to split on the . charater" do
+			result = @my_string.split("\.")
+			result.should have(2).items	
+		end
+		it "should be able to give the encoding of the string" do
+                        encoding = @my_string.encoding
+                        encoding.should eq (Encoding.find("UTF-8"))
+=======
 			@my_string.should have(@my_string.size).characters
 		end
 		it "should be able to split on the . charater" do
@@ -21,6 +33,7 @@
 		end
 		it "should be able to give the encoding of the string" do
 			@my_string.encoding.should eq (Encoding.find("UTF-8"))
+>>>>>>> 476e4b543ee68aad8bb809afdfe2207afd39e8e5
 		end
 	end
 end