Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from codecombat/master

Merge with codeCombat
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from codecombat/master

update
Merge remote-tracking branch 'upstream/master'
Merge pull request #4 from codecombat/master

Update
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #5 from codecombat/master

update
Merge branch 'master' of https://github.com/Darredevil/codecombat
Update ru.coffee
Update server.coffee

Removed unnecessary return statement in server.coffee. Functions will always return their final value.
Update diplomat.jade

added myself to diplomats
Added joke tip
Update ru.coffee

With fixes from [M-r-A](https://github.com/M-r-A)
Update ru.coffee

With @M-r-A fixes
Update pt-PT.coffee
Update pt-PT.coffee
Update pt-PT.coffee
Update pt-PT.coffee