merge and styles
Merge branch 'master' of https://github.com/starlock/poplight

* 'master' of https://github.com/starlock/poplight:
  Removing dummy content