Merge branch 'JonsBranch'
Assuring Added sounds
Fixing Conflict errirs
Merge branch 'JonsBranch'
Merge branch 'master' into JonsBranch