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

Conflicts:
	finalproject.userprefs
probuilder added
Update .gitignore
deleted probuilder
Update .gitignore
removed 6by7 probuilder stuff
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