Updated readme.
Resolved conflict.
Merge branch 'master' of github.com:bkaradzic/bgfx
Added *.lua to .gitattributes.