Refactor for week 2
Test for #merge
Resolve merge conflicts
Test for #pull
Improved test for fetch
Tests for #pull
Add remotes
Remove week 2 code
Merge branch 'week_2'

Conflicts:
	lib/git/repository.rb
	spec/git/repository_spec.rb