Create .gitignore
pulling master
Merge branch 'master' into feat/bs_layout