commiting twitter changes
Merge branch 'master' of github.com:Upstatement/blades
Merge branch 'master' of github.com:Upstatement/blades
Merge branch 'master' of github.com:Upstatement/blades
Merge branch 'master' of github.com:Upstatement/blades
Merge branch 'master' of github.com:Upstatement/blades
fixed merge conflict on home.twig