Merge pull request #1 from justinelam/newbranch

New greeting. I hate the use of Whee!
adding 123
Went with the Ahoy message.

Merge branch 'master' of github.com:justinelam/test

Conflicts:
	README.txt
Changed file.
Merge pull request #2 from justinelam/another

Changed file.
creating havoc and fixing it