2nd try at exclamation marks and smiley face
merge branches

Merging my branch with master