music in and sounds are in

working n hooking up some basic sounds now
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/Game.unity