Merge pull request #16 from HeisenBugDev/Json

Json
Merge remote-tracking branch 'origin/master'
Merge commit '342472d186661d74063aace489e95c89a340d4d1' into Json
Merge remote-tracking branch 'origin/UI-Elements'
Merge remote-tracking branch 'origin/master'
Merge pull request #18 from HeisenBugDev/UI-Elements

Ui elements
Merge remote-tracking branch 'origin/master'
Begin working
Merge pull request #19 from HeisenBugDev/nesting

README file update
Merge remote-tracking branch 'origin/master'
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
Merge remote-tracking branch 'origin/master'
Merge pull request #22 from HeisenBugDev/UI-Elements

outlets and targets now working
Merge remote-tracking branch 'origin/master'
Added resource location to JSON (HeisenViewModel)
Added resource location to JSON (HeisenViewModel)
changed ResourceLocation to String
Merge branch 'Json' into Rendering