fixes #293
fixes #294
Merge branch 'dev' of https://github.com/thelac/selfie into dev

* 'dev' of https://github.com/thelac/selfie:
  web edits
  more web stuff
  website edits
  website