Merge remote-tracking branch 'origin/master'
Merge commit '342472d186661d74063aace489e95c89a340d4d1' into Json
Excluded Gradle Wrapper and added eclipse files to gitignore
Merge pull request #21 from HeisenBugDev/More-Git-ignore-changes

Changed gitignore again excluding unnecessary changes and adding the gradle wrapper jar back in