edit gitignore
add bootstrap on master
Merge branch 'dev'
Merge branch 'master' into dev
Merge branch 'dev' into dev-magre