Uneccessary changes

Commit to get latest
Merge branch 'master' of https://github.com/JordanStone/CS345BeatEmUp

Conflicts:
	Assets/Scenes/SceneOne.unity
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/00/00000000000000005100000000000000
	Library/metadata/01/01b622d4830754f4886f4b03606fb1ec
	Library/metadata/02/028c11450244e4feabe6828fc2ec3e03
	Library/metadata/08/086544326e5604e81a96f61fb0f0a78e
	Library/metadata/08/08f28e42a647e2a4cbd32e793359aa3c
	Library/metadata/0a/0a70c16c7b47ab048bc9e03b588c24f6
	Library/metadata/12/12747bdca86d344c2a4f1ea2bb362f17
	Library/metadata/17/1733bb48838e0ea47b69699ba73e31cd
	Library/metadata/1a/1a5d8cd24a805cd44b00c7f1e1e4d287
	Library/metadata/28/28eb56434bed6f04586adb0c75b87cb2
	Library/metadata/2a/2a49aa5b76842305fc65897abcdcf30f
	Library/metadata/53/531c14f8d5cdc4e5baa83ee6e16f783a
	Library/metadata/60/60fb16895cbaf4946906b6d63f3653ec
	Library/metadata/65/65fb74f285bbb4d11a3b64d99c0a53b0
	Library/metadata/67/6793afeb1ba524134ae93ee3038763e0
	Library/metadata/6e/6e77d387966489d6cb6bb6ba39e09c45
	Library/metadata/82/820a38890d8f1f742b289b29927ffb3b
	Library/metadata/8e/8e3ff3e27ca4bc54dda56e89e0550dfa
	Library/metadata/97/97b050d43ac7c4d2b9f6cbb587650761
	Library/metadata/ac/acd22cefe09441d2c7e801193b935495
	Library/metadata/d2/d236c2e07976ff942a0e23d979e8f4cb
	Library/metadata/d3/d3b7d84ffb95cc04aaeb74f19a10f034
	Library/metadata/e7/e79b4ee3b7b31ee499b1532270c7730d
	Library/metadata/e7/e7d408c28925be148bd9ef32f4f28e44
	Library/metadata/e8/e83c2f831bb0fd14b92751cdcbe823ec
	Library/metadata/e9/e976c6d3ebc1e4a85aa7186a3192d8c5
	Library/shadercompiler-1.log
Conversion to 3D

Engineer man runs on a 2D plane with a kick-a** camera