tweaked stuff added sounds
fix merge
fix merge
Merge branch 'JacobsBranch'
merged
forgot to save scenen before merge