Font Awesome as a sprite (2)

GitHub's claiming the branches can't be automatically merged (probably because I've had to add in the contents of some revisions after the fact), but content-wise I don't think anything's missing like it was before. Sorry about all the revisions, GitHub was acting up on me and I thought it'd be easier to do everything online, which meant I had to commit every file individually (then of course I had to upload an image, so in the end I had to clone the branch anyway :P).