Add Collaborating without Git
Add another pull test
Merge pull request #2 from eulcey/another_branch

Add another pull test
Merge remote-tracking branch 'origin/master'

Conflicts:
	lesson_3_reflections.txt
Merge branch 'master' into different-idea