Added more models and guns
Fixed broken merge