Merge branch 'current' of https://github.com/cwiki-us-docs/java-tutorials into HEAD

# Conflicts:
#	.gitignore
#	.idea/compiler.xml
#	.idea/encodings.xml
#	.idea/vcs.xml
#	pom.xml
#	src/main/java/com/ossez/lang/tutorial/overview/HelloWorld.java

.gitignore

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ### Gradle ###
 .gradle
 build/
@@ -233,3 +234,93 @@ fabric.properties
 
 # Sonarlint plugin
 .idea/sonarlint
+=======
+# Binaries
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+*.war
+*.ear
+*.sar
+*.class
+
+# Maven 
+target/
+
+# eclipse project file
+.settings/
+.classpath
+.project
+
+
+# IntelliJ project files 
+*.iml
+*.iws
+*.ipr
+.idea/
+
+
+
+# NetBeans specific
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+nbactions.xml
+nb-configuration.xml
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# =========================
+# Operating System Files
+# =========================
+
+# OSX
+# =========================
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+>>>>>>> 361e407d91e00158295aadeaca0a91d84a534820