merge Sudhanshu and Stella's changes together
added right click to change weapons.