added README
fixed translation issues
WTF
resolved conflicts