Ember dallas

Fixed the merge conflict from the previous PR

Added Ember Dallas meetup entry to data/meetups.yml