Reformated if else construct
Merge branch 'master' of https://github.com/pavanh91/Ultimate-Ascent
Got rid of useless import
Merge pull request #3 from pavanh91/master

Xbox controller update