Merge pull request #84 from susieye19/master

Upvotes
Merge pull request #85 from susieye19/master

Change color for glyphicon
Made some changes
Merge Susie's changes to upvote glyphicons
Merge Susie's changes
Merge branch 'susieye19-master'
Get CoffeeScript for upvote/unvote working
Fix margins