Added braces to some if statements -Eric
Added climbing stuff - Lauren/Eric :B
Fixed conflicts ~ Matt