added jump sound and death sound
added jump sound and death sound
added sounds
Merge branches 'master' and 'greg'

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.projects/MorphGame/.indexes/e4/fa/history.index
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml