splash2 and css
Merge branch 'front' of https://github.com/Sassafrass6/cs373-idb into front