Merge pull request #21 from codergreen/master

movement bug fix
Making upgrade scene functional
commit overwrite

fixing
commit overwrite 2

attempt 2
commit overwrite 3

bug fix
Final fix and merge

Finally!