Bullets are in folders

sukkaaaaaaas
Added jumping
Merge branch 'master' of https://github.com/cschloer/CS361-Spectrum

Conflicts:
	Spectrum/Assets/Resources/Scripts/CharacterModel.js
	Spectrum/Assets/Resources/Scripts/Landing.js.meta
	Spectrum/Assets/Resources/Scripts/Monster.js
	Spectrum/Assets/Resources/Textures/landing.png.meta
	Spectrum/Library/CurrentMaximizeLayout.dwlt
	Spectrum/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Spectrum/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Spectrum/Library/assetDatabase3
	Spectrum/Library/guidmapper
	Spectrum/Library/metadata/52/52ec0bdb751e54637a5fa1cb641a2f70
	Spectrum/Library/metadata/9b/9b5f88437b980a74aba6ea12b18240da
	Spectrum/Spectrum.userprefs