added CSS and Bootstrap
Merge branch 'master' of https://github.com/pgarz/lab2