Playing around with git 
Nicola Hetrick
Kira Combs

SUCCESSFUL CLONE :)

Successfully pulled Nikki's file and edited the file

Nikki is making changes!! And so is kira!!! oooooooOOOOooooOOO
Please note today is 10/11/12 :) hehe :) 

Bippidy Boppity Boo. Trying to make conflicts! YAY!

Creating new conflicts after Nikki's merge.....

Now resolving the conflicts :)