Changes
Update fix.txt
Merge git://github.com/madhuramit/hellogitworld
Merge branch 'master' of https://github.com/githubschool/hellogitworld

Conflicts:
	fix.txt