Small error message change
Merge branch 'master' of https://github.com/swestwood/proto1-cs247-p3
Use [emoticon] instead of [?] when redacting smileys