added a line of text
Merge remote-tracking branch 'origin/jakesidea'

Conflicts:
	README.md
changed the fix.txt file
Merge branch 'master' of github.com:badassmexican/hellogitworld into jakesidea