final commit for now
Merge branch 'master' of https://github.com/shyamu/RTSRider