update
merge
Added Unicorn config
Merge branch 'master' of https://github.com/rlconley/halp
Resolve button and permission logic
Merge pull request #8 from curiousepic/master

Resolve button