Test commit to see if the branch is working
Merge branch 'master' of https://github.com/kedromelon/modding_project into Will_develop
Merge branch 'master' of https://github.com/kedromelon/modding_project into Will_develop
merged master with updated gitignore
Added second player. Added playerkick scripts for both players so they bounce off each other.
Imported probuilder packages.
Merge branch 'master' of https://github.com/kedromelon/modding_project into Will_develop

Conflicts:
	Assembly-CSharp.pidb
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/6by7.meta
	Assets/6by7/ProBuilder.meta
	Assets/6by7/ProBuilder/API Examples.meta
	Assets/6by7/ProBuilder/API Examples/Runtime Editing.meta
	Assets/6by7/ProBuilder/API Examples/Runtime Editing/Materials.meta
	Assets/6by7/ProBuilder/API Examples/Runtime Editing/Materials/instructions.mat
	Assets/6by7/ProBuilder/API Examples/Runtime Editing/RuntimeEdit.cs
	Assets/6by7/ProBuilder/API Examples/Runtime Editing/RuntimeEdit.unity
	Assets/6by7/ProBuilder/API Examples/Runtime Editing/instructions.png
	Assets/6by7/ProBuilder/Classes.meta
	Assets/6by7/ProBuilder/Classes/ProBuilderCore.dll.meta
	Assets/6by7/ProBuilder/Classes/pbVersionBridge.cs
	Assets/6by7/ProBuilder/Editor.meta
	Assets/6by7/ProBuilder/Editor/ProBuilderEditor.dll.meta
	Assets/6by7/ProBuilder/Editor/ProBuilderMenuItems.cs
	Assets/6by7/ProBuilder/Editor/pb_About.cs
	Assets/6by7/ProBuilder/Editor/pb_Preferences.cs
	Assets/6by7/ProBuilder/Editor/pb_Upgrade_Utility.cs
	Assets/6by7/ProBuilder/Resources.meta
	Assets/6by7/ProBuilder/Resources/Materials.meta
	Assets/6by7/ProBuilder/Resources/Materials/Collider.mat
	Assets/6by7/ProBuilder/Resources/Materials/Default.mat
	Assets/6by7/ProBuilder/Resources/Materials/Default_VertexColor.mat
	Assets/6by7/ProBuilder/Resources/Materials/NoDraw.mat
	Assets/6by7/ProBuilder/Resources/Materials/Trigger.mat
	Assets/6by7/ProBuilder/Resources/Materials/VertexOff.mat
	Assets/6by7/ProBuilder/Resources/Textures.meta
	Assets/6by7/ProBuilder/Resources/Textures/GridBox_Collider.tga
	Assets/6by7/ProBuilder/Resources/Textures/GridBox_Default.tga
	Assets/6by7/ProBuilder/Resources/Textures/GridBox_NoDraw.tga
	Assets/6by7/ProBuilder/Resources/Textures/GridBox_Trigger.tga
	Assets/6by7/ProBuilder/Resources/Textures/VertOff.tga
	Assets/6by7/ProBuilder/Resources/Textures/VertOn.tga
	Assets/6by7/ProBuilder/Resources/Textures/dot.png
	Assets/6by7/ProBuilder/Resources/Textures/gridBox_1meter.psd
	Assets/6by7/ProBuilder/Resources/Textures/horizontal.png
	Assets/6by7/ProBuilder/Resources/Textures/uv.png
	Assets/6by7/ProBuilder/Resources/Textures/uv_grid.png
	Assets/6by7/ProBuilder/Resources/Textures/vertical.png
	Assets/6by7/ProBuilder/Shader.meta
	Assets/6by7/ProBuilder/Shader/DiffuseVertexColor.shader
	Assets/6by7/ProBuilder/Shader/DiffuseVertexColorEmission.shader
	Assets/6by7/ProBuilder/Shader/DiffuseVertexColorTransparency.shader
	Assets/6by7/ProBuilder/Shader/UnlitColor-Overlay.shader
	Assets/6by7/ProBuilder/Shader/UnlitColor.shader
	Assets/6by7/ProBuilder/VersionInfo.txt
	Assets/6by7/ProBuilder/changelog.txt
	Assets/6by7/ProGrids.meta
	Assets/6by7/ProGrids/Classes.meta
	Assets/6by7/ProGrids/Classes/pg_Util.cs
	Assets/6by7/ProGrids/Editor.meta
	Assets/6by7/ProGrids/Editor/pg_Editor.cs
	Assets/6by7/ProGrids/Editor/pg_Preferences.cs
	Assets/6by7/ProGrids/VersionInfo.txt
	Assets/6by7/Shared.meta
	Assets/6by7/Shared/Code.meta
	Assets/6by7/Shared/Resources.meta
	Assets/6by7/Shared/Resources/GUI.meta
	Assets/6by7/Shared/Resources/GUI/DroidSansMono.ttf
	Assets/6by7/Shared/Resources/GUI/DroidSansMono.ttf.meta
	Assets/6by7/Shared/Resources/GUI/ProBuilderGUI_ACG.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderGUI_Group.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderGUI_Handle-Global.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderGUI_Handle-Local.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderGUI_Handle-Plane.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderGUI_Lightmap.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderGUI_Merge.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderGUI_Mode-Face.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderGUI_Mode-Select.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderGUI_Mode-Texture.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderGUI_Mode-Vertex.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderGUI_Prefab.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderGUI_Shape.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderToggles.meta
	Assets/6by7/Shared/Resources/GUI/ProBuilderToggles/ProBuilderGUI_collision-off.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderToggles/ProBuilderGUI_collision-on.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderToggles/ProBuilderGUI_detail-off.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderToggles/ProBuilderGUI_detail-on.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderToggles/ProBuilderGUI_mover-off.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderToggles/ProBuilderGUI_mover-on.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderToggles/ProBuilderGUI_nodraw-off.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderToggles/ProBuilderGUI_nodraw-on.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderToggles/ProBuilderGUI_trigger-off.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderToggles/ProBuilderGUI_trigger-on.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderToggles/ProBuilderGUI_world-off.tga
	Assets/6by7/Shared/Resources/GUI/ProBuilderToggles/ProBuilderGUI_world-on.tga
	Assets/6by7/Shared/Resources/GUI/ProGridsGUI_GridSize.tga
	Assets/6by7/Shared/Resources/GUI/ProGridsGUI_SnapToGrid.tga
	Assets/6by7/Shared/Resources/GUI/ProGridsToggles.meta
	Assets/6by7/Shared/Resources/GUI/ProGridsToggles/ProGridsGUI_AnglesOff.tga
	Assets/6by7/Shared/Resources/GUI/ProGridsToggles/ProGridsGUI_AnglesOn.tga
	Assets/6by7/Shared/Resources/GUI/ProGridsToggles/ProGridsGUI_OffLight.tga
	Assets/6by7/Shared/Resources/GUI/ProGridsToggles/ProGridsGUI_OnLight.tga
	Assets/6by7/Shared/Resources/GUI/ProGridsToggles/ProGridsGUI_VisOff.tga
	Assets/6by7/Shared/Resources/GUI/ProGridsToggles/ProGridsGUI_VisOn.tga
	ProjectSettings/InputManager.asset
Merge branch 'master' into noah_develop

Conflicts:
	finalproject.userprefs
probuilder added
Update .gitignore
deleted probuilder
Update .gitignore
removed 6by7 probuilder stuff
Merge branch 'Will_develop'

Conflicts:
	Assets/6by7/ProBuilder.meta
	Assets/6by7/ProBuilder/API Examples.meta
	Assets/6by7/ProBuilder/API Examples/Runtime Editing.meta
	Assets/6by7/ProBuilder/API Examples/Runtime Editing/Materials.meta
	Assets/6by7/ProBuilder/Classes.meta
	Assets/6by7/ProBuilder/Classes/ProBuilderCore.dll.meta
	Assets/6by7/ProBuilder/Editor.meta
	Assets/6by7/ProBuilder/Editor/ProBuilderEditor.dll.meta
	Assets/6by7/ProBuilder/Editor/pb_About.cs
	Assets/6by7/ProBuilder/Resources.meta
	Assets/6by7/ProBuilder/Resources/Materials.meta
	Assets/6by7/ProBuilder/Resources/Textures.meta
	Assets/6by7/ProBuilder/Shader.meta
	Assets/6by7/ProBuilder/changelog.txt
	Assets/6by7/ProGrids.meta
	Assets/6by7/ProGrids/Classes.meta
	Assets/6by7/ProGrids/Editor.meta
	Assets/6by7/ProGrids/Editor/pg_Editor.cs
	Assets/6by7/ProGrids/VersionInfo.txt
	Assets/6by7/Shared.meta
	Assets/6by7/Shared/Code.meta
	Assets/6by7/Shared/Resources.meta
	Assets/6by7/Shared/Resources/GUI.meta
	Assets/6by7/Shared/Resources/GUI/DroidSansMono.ttf.meta
	Assets/6by7/Shared/Resources/GUI/ProBuilderToggles.meta
	Assets/6by7/Shared/Resources/GUI/ProGridsToggles.meta
Merge branch 'noah_develop'

Conflicts:
	Assets/Scenes/willscene.unity.meta
	Assets/Scripts/Bcontroller.cs.meta
	Assets/Scripts/player1kick.cs.meta
	Assets/Scripts/player2kick.cs.meta
	Assets/materials/player 2.mat.meta
Merge branch 'Will_develop'

Conflicts:
	Assets/Scenes/Matt's scene.unity