resolved merge conflicts
Merge pull request #41 from mjafshar/achievement_labels

resolved merge conflicts