Merge pull request #248 from KodeKracker/master

merge conflict push
Merge pull request #249 from KodeKracker/master

counter strike event content edited