12/3/2011
Just getting some practice with git and github

Adding some text here on line 3
And a little more on line 4

Added more text on line 6.  I'm on master creating that conflict.

Added even more text on line 8.  How do I get diff to work?