:space_invader: Added .gitattributes
Merge branch 'master' of https://github.com/RiceBang/FPoS into upstream
Update gitignore; merge branches