branch 1 comitt
Merge pull request #14 from bonekill/branch1

branch 1 comitt
Merge branch 'master' of https://github.com/bonekill/HelloWorld

Conflicts:
	program/main.txt
Update main.txt
Merge pull request #16 from bonekill/master

update to master