Police say a dispute between neighbors turned violent last night on El Rancho, when Joshua Johnston armed himself with a baseball bat and reportedly struck his neighbor Gabriel Martinez-Olmos, in the head as well as an unidentified woman in the arm, breaking it. Martinez-Olmos, allegedly went home and got handgun, went to Johnston's residence, kicked down the door and entered with his handgun pointing it at the occupants. He ordered them to lie on the floor. Police say he pistol whipped someone inside and left. He's been charged with Home Invasion, Battery with a Deadly Weapon, and Assault with a Deadly Weapon and booked into Washoe County Jail on bail of $60,000. Joshua Johnston has been charged with Battery Causing Substantial Bodily Harm and Battery with a Deadly Weapon and booked on $30,000.00 bail.