Merge branch 'master' of https://github.com/scanton/wolop

Conflicts:
app/sunshine.coffee.md
Resolved conflict

Small conflict on branch merge