empty push
Squashed commit of the following:

commit 4e99947a93f5230313bcfec74113816c64ead1e1
Author: Ben Doherty <ben@notionparallax.co.uk>
Date:   Wed Jan 29 02:26:29 2014 +0000

    this breaks things roll it back

commit c911ebfb4f66201da423249b1dc64abffc83827b
Author: Ben Doherty <ben@notionparallax.co.uk>
Date:   Wed Jan 29 02:06:01 2014 +0000

    tidy up editable html and remove line end spaces

commit 406b5f9c9310dde2056116fa2f046bf1eadbe15b
Author: Ben Doherty <ben@notionparallax.co.uk>
Date:   Wed Jan 29 01:24:12 2014 +0000

    made editable stack when very small, fixes #131

commit 604b9fbf776d899c5b6d5b5787ffd7597ed638eb
Author: Ben Doherty <ben@notionparallax.co.uk>
Date:   Wed Jan 29 00:32:20 2014 +0000

    added a comment to #132

commit 4eb9b0b674f18d079a52f64c53022b86008049b0
Author: Ben Doherty <ben@notionparallax.co.uk>
Date:   Wed Jan 29 00:31:48 2014 +0000

    resolve merge conflict

commit fd370033df1ffa190a1553a38401a4106c59ed81
Merge: d2712e3 71d9089
Author: Ben Doherty <ben@notionparallax.co.uk>
Date:   Wed Jan 29 00:25:12 2014 +0000

    Merge branch 'master' of https://github.com/notionparallax/ShadowWolf

commit d2712e399f2b454e6cab835c5404e74d196e3b11
Author: Ben Doherty <ben@notionparallax.co.uk>
Date:   Wed Jan 29 00:24:30 2014 +0000

    fix #132

Additionally I removed the >>>>> inserted by git and left in in the show.html
page.
bypass angular bug by not inline replacing <editable>s

see https://github.com/angular/angular.js/issues/1459 for more info.
Merge remote-tracking branch 'origin/master'