SFX are now functional, added light punch asset
Merge branch 'master' into landonMOE
reconciled changes with master