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
Added joke tip
Merge branch 'master' of https://github.com/Darredevil/codecombat
Removed empty file and unused function
Removed extraneous code
Working on flippable tile highlight bounds marks.
Fixed some wizard positioning issues in multiplayer.
Made some style tweaks to the employers page to move the filters into a sidebar when authorized.
Update play_view.coffee

Added "Guide Everyone Home" level
Merge pull request #1277 from gosnat/patch-9

Update play_view.coffee
Fixed #1198