Task: https://teambox.com/#!/projects/fissionstrategycom-redesign/tasks/2582383
Merge branch '2.0' of github.com:fission-strategy/fissionstrategy.com into 2.0