started work on assassinations
fixed merge conflict in player_mission.rb