change bootstrap to sass version
Resolving merge conflict
adding readme so github doesn't complain