Adding back in the styles that got deleted in the merge
Ignoring the style.css file because we only need to track changes to the less file
Commenting out bootstrap css because it breaks some things
Cleaning up CSS, more changes from usability study