merged master with updated gitignore
Merge branch 'master' into noah_develop

Conflicts:
	finalproject.userprefs
updated gitignore to prevent probuilder problems
probuilder added
Update .gitignore
deleted probuilder
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
Added model
Merge branch 'master' of https://github.com/kedromelon/modding_project into Will_develop

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