Pulling the changes from candy-chat to my local repo.

I hope this is the way i can get my repo updated and not the other way around.