Add high five action

Also fix committed conflicts =/