Merge branch 'master' of http://github.com/brodyberg/coffee-script

src/grammar.coffee

@@ -102,7 +102,7 @@ grammar =
     o "Comment"
   ]
 
-  # A an indented block of expressions. Note that the [Rewriter](rewriter.html)
+  # An indented block of expressions. Note that the [Rewriter](rewriter.html)
   # will convert some postfix forms into blocks for us, by adjusting the
   # token stream.
   Block: [

src/lexer.coffee

@@ -136,7 +136,7 @@ exports.Lexer = class Lexer
     @i += match[1].length
     true
 
-  # Matches and conumes comments.
+  # Matches and consumes comments.
   commentToken: ->
     return false unless match = @chunk.match(COMMENT)
     @line += count match[1], "\n"