premerge
premerge
Merge branch 'master' of https://github.com/riveraonada/chaos

Update linux branch
Resources & look
Resources & look