Reorganized folders

A TON OF REORGANIZATION!!!
Also added boat prefab
fixed Terrain I broke
Grabbed Joes stuff
should hopefully work
third try commit all
Merge branch 'master' of https://github.com/jnguye14/Climber

Conflicts:
	Assets/Scenes/Test 2 TriggerTest.unity.meta