Add Objective-C++ to languages.yml
Add Objective-C++ samples
Update samples
Add Grammatical Framework
Change GF lexer from haskell to Haskell
Remove Gla and Gle from Gf test samples
Try to fix encoding probs by converting to utf8
Merge remote-tracking branch 'upstream/master'
Update languages.yml

Added support for Eagle PCB files which are becoming common enough now on Github to make this addition.
Add the Mercury language to linguist

lib/linguist/languages.yml:
    Add the declaration for the language.

samples/Mercury:
    Add samples for the classifier as Mercury shares it's filename extension
    with several other languages.
Added new Rscript code
Move file location based on Travis error message
Does adding Rscript as an alias help?
Basic SAS

Just an entry for SAS with the basic .sas file extension and two
examples.
Add misser lexer entry for nesC to languages.yml

The nesC entry in the languages.yml file was missing a lexer entry
and thus wasn't getting picked up. This adds the required lexer line.
bundle fix

Lets see if this fixes the failing tests
Add Dogescript support
Add Frege language

What is Frege?
-------------
Frege is a non-strict, pure functional programming language in the spirit of Haskell for the JVM.
It enjoys a strong static type system with type inference.
Higher rank types are supported, though type annotations are required for that.

Frege programs are compiled to Java and run in a JVM.
Existing Java Classes and Methods can be used seamlessly from Frege.

The Frege programming language is named after and in honor of Gottlob Frege.

Project State:
-------------
The compiler, an Eclipse plugin and a provisional version of the documentation can be downloaded
from here https://github.com/Frege/frege/releases.

The REPL can be downloaded from here
https://github.com/Frege/frege-repl/releases.

An online REPL is running here
http://try.frege-lang.org/.

Examples:
--------
1) Command Line Clock: https://github.com/Frege/frege/blob/master/examples/CommandLineClock.fr
2) Brainfuck: https://github.com/Frege/frege/blob/master/examples/Brainfuck.fr
3) Concurrency: https://github.com/Frege/frege/blob/master/examples/Concurrent.fr
4) Sudoku: https://github.com/Frege/frege/blob/master/examples/Sudoku.fr
5) Java Swing examples: https://github.com/Frege/frege/blob/master/examples/SwingExamples.fr
Do not reset options when calling highlight
Merge branch 'pr/411' into obj_cpp

Conflicts:
	lib/linguist/samples.json