added bootstrap
updated stylez
Merge branch 'development'