added the last of us
Merge branch 'dev2'
fixed merge conflict with the last of us, should be remastered version