Merge pull request #7 from amarini/master

changed F
Update 1.txt
test programmatic pull request
test cmd line pull request
Merge remote-tracking branch 'upstream/master'

Conflicts:
	1.txt
more programmatic stuff
Merge pull request #9 from musella/master

created from script
changed A differently