added boss gun object and placed some test guns
fixed conflicts