Resolve merge conflict.

parser.go

@@ -592,6 +592,8 @@ var DefaultKeywords []*Keyword = []*Keyword{
 	&Keyword { "list", TokenKindOpenList, StringValue("[") },
 	&Keyword { "done", TokenKindCloseList, StringValue("]") },
     &Keyword { "the", TokenKindGet, StringValue("$") },
+	&Keyword { "a", TokenKindGet, StringValue("$") },
+	&Keyword { "an", TokenKindGet, StringValue("$") },
 }
 
 var DefaultKeywordsFR []*Keyword = []*Keyword{

value.go

@@ -407,7 +407,6 @@ func ParseOptArgs(args []Value, required int, to...interface{}) ([]Value, error)
 	return rest, nil
 }
 
-
 // ParseArgs is helper to easily convert Muesli value lists to "normal" 
 // Go values.  It is the same as ParseOptArgs(args, len(to, to...)
 func ParseArgs(args []Value, to...interface{}) ([]Value, error) {