local changes and merging with jareds css
Merge branch 'front' of https://github.com/Sassafrass6/cs373-idb into front
minor changes to grep and updated splash
Merge branch 'front' of https://github.com/Sassafrass6/cs373-idb into front