conflicts resolved
conflicts resolved
claim and unclaim buttons switch
conflicts resolved
Merge pull request #46 from graytmatter/master

claim and unclaim buttons switch