Change to helloes added a scary face
Merge branch 'master' of https://github.com/mamuso/thisisatest

Conflicts:
	README.md