something

insectoids
update to lions

update to lions including lionesses
Merge remote-tracking branch 'origin/bugfix'
conflict to bugfix

conflictng errors, hopefully!