Merge pull request #11 from jnguye14/Temp-Jordan

Temp jordan
Merge branch 'master' of https://github.com/jnguye14/Climber into Temp-Jordan