Added strings to conversation.java
Merge branch 'master' of https://github.com/WeHeartGaming/Codename-WHIRC