removed bootstrap
Merge branch 'version1'
removed boostrap