Upgraded to bootstrap
newline in readme
fix conflict