Merge pull request #161 from cboutter/master

Added a newline at end of the Mercurial and Java files in order to build a gitignore file from multiple templates.

Global/Mercurial.gitignore

@@ -1,3 +1,3 @@
 /.hg/*
 */.hg/*
-.hgignore
+.hgignore

Java.gitignore

@@ -1 +1 @@
-*.class
+*.class