Add new bootstrap version. Change to scss. Still some stuff to figure out...
Merge the two. Gosh it's awful