Merge branch 'heroku-edition'

* heroku-edition:
Merge branch 'heroku-edition'

* heroku-edition:
  update bookmarklet
Merge branch 'heroku-edition'

* heroku-edition:
  add android bookmarklet instructions
Merge branch 'heroku-edition'

* heroku-edition:
  crop image
Merge branch 'heroku-edition'

* heroku-edition:
  update android guide
Merge branch 'heroku-edition'

* heroku-edition:
  update android guide
refactor
update bookmarklet script
use id as reference for articles
refactor code style
add masonry
fix image width for guide
refactor masonry and add remote deletion
include description, and change layout for input field
add more styling
fix flash message button margins
add favicon and logo
add logo to landing
Merge branch 'master' into heroku-edition

* master:
  add logo to landing
  add favicon and logo
  fix flash message button margins
  add more styling
  include description, and change layout for input field
  refactor masonry and add remote deletion
  fix image width for guide
  add masonry
  refactor code style
  use id as reference for articles
  update bookmarklet script
  refactor