Automatically built.

commit 91b3c6ca62ed8b512a9c3e85b5917465c5181a5d
Merge: 136e0c1 43b2f9e
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Mon Nov 3 16:17:40 2014 -0800

    Merge pull request #318 from code-dot-org/calcFreePlay

    freeplay for calc

commit 136e0c18f796bc046fa5755596c9ee97574273dc
Merge: 09cb53e 7b495f3
Author: Laurel Fan <laurel.fan@gmail.com>
Date:   Mon Nov 3 16:12:26 2014 -0800

    Merge branch 'staging' of github.com:code-dot-org/code-dot-org into staging