Added some css for more consistent spacing
Merge pull request #524 from code-dot-org/sharing-modal-update

Added some css for more consistent spacing
Automatically built.

commit 4ba602ca01850fd915282369122ca05308be2231
Merge: 5cdb41c af95603
Author: CaptainStack <CaptainStack@outlook.com>
Date:   Fri Nov 21 14:37:36 2014 -0800

    Merge pull request #524 from code-dot-org/sharing-modal-update

    Added some css for more consistent spacing

commit af95603a2a625d86f9a88542adcf579fc3437951
Author: CaptainStack <CaptainStack@outlook.com>
Date:   Fri Nov 21 14:36:49 2014 -0800

    Added some css for more consistent spacing
Add stub functional example block type
Merge pull request #526 from code-dot-org/functional_example_block

Add stub functional example block type
Fix haml error
Automatically built.

commit 7134955c6f1c04161d0cec73a7b0df1e6d70c0cc
Merge: 9c73929 865c8cf
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Fri Nov 21 15:16:11 2014 -0800

    Merge pull request #526 from code-dot-org/functional_example_block

    Add stub functional example block type

commit 865c8cf7dc1971c7ec468f13fbe0557eb213d231
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Fri Nov 21 15:13:36 2014 -0800

    Add stub functional example block type
Extract a few methods in long method (functionally equivalent)
Automatically built.

commit cba79e205911be790de728d345e87db5bd4b3d39
Author: Brian Jordan <bcjordan@gmail.com>
Date:   Fri Nov 21 16:14:18 2014 -0800

    Extract a few methods in long method (functionally equivalent)
Dropbox changes.
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into test
Merge branch 'production' of github.com:code-dot-org/code-dot-org into test
update frozen intro video