conflicts resolved
conflicts resolved
added show buttons animation to index page
merged sandi's changes
claim and unclaim buttons switch
conflicts resolved
smoothed index reveal button animation
Merge pull request #46 from graytmatter/master

claim and unclaim buttons switch
updated files from upstream