Merge

Merged work from all groups
used ATTACKABLE from group 2