Cleaned last merge.
Merge branch 'master' of https://github.com/aaronweiss74/Ultimate-Ascent