Updated some stuff
Merge branch 'master' of github.com:OrangeShark/Let-Us-Ride