css
made some css changes
added bootstrap
made some tests
Merge branch 'feature/css' into develop