Declare .cs as Smalltalk changeset
C# samples to disambiguate from Smalltalk
Re-generate samples.json
Merge branch 'master' into cs-smalltalk

Conflicts:
	lib/linguist/languages.yml
	lib/linguist/samples.json
change ace mode of game maker language to c++
add support for StyleCop XML configuration files
sort alphabetically
Added a more suitable grammar for Mercury
Add Jasmin textmate language
Add Jasmin to languages.yml
Add some samples of Jasmin assembly
Put Jasmin entry in the right place.
Add Objective-J samples
Fix empty sample file.
Use atom/language-atom for the YAML grammar
Merge pull request #1885 from github/gjtorikian-patch-1

Use atom/language-atom for the YAML grammar
Merge pull request #1877 from sebgod/change-mercury-grammar

Added a more suitable grammar for Mercury
Merge pull request #1881 from hawkw/master

Add support for Jasmin JVM assembly
Merge pull request #1876 from Mailaender/patch-2

Added support for StyleCop XML configuration files
Merge pull request #1797 from github/cs-smalltalk

Cs smalltalk