merged with matt's scene. added 2 player asset/scripts for bounciness. renamed scene to matt's scene revamp
pull from will_develop

Conflicts:
	Assets/Scenes/Matt's scene Revamp.unity
Added model
Merge branch 'master' of https://github.com/kedromelon/modding_project into Will_develop

Conflicts:
	Assets/Scenes/Matt's scene Revamp.unity
Merge branch 'master' into noah_develop

Conflicts:
	Assets/6by7.meta
added 6by7.meta to .gitignore; fixed controller jumping repeat bug
Merge branch 'master' into noah_develop
added dash scripts; edited player controls: WASD/Q-dash/Lshift-jump + IJKL/U-dash/Rshift-jump
Merge branch 'master' into Matt'sBranch

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