Fixed update
Merge branch 'master' of github.com:jceipek/Friendly-Fire