pull gh to master

adding bootstraps template changes