add civiv hacks meetup
Resolve conflicts Arrrrrrrrrrr