Removed local directory
Merge branch 'search' of https://github.com/sassafrass6/cs373-idb into search
conflict resolution (repeat)
Conflicts:
	local-html/index.html
half template for splash
API key working
second splash page for my purposes
css cleanup
Branch fix with local-html.
filling out a potential splash page
changes to tab pane for layout
local changes and merging with jareds css
Merge branch 'front' of https://github.com/Sassafrass6/cs373-idb into front
add gitagrep logo
minor changes to grep and updated splash
Merge branch 'front' of https://github.com/Sassafrass6/cs373-idb into front
updates to splash2
Merge branch 'front' of https://github.com/Sassafrass6/cs373-idb into front
halfway done with cody version of splash
Merge branch 'front' of https://github.com/Sassafrass6/cs373-idb into front
splash2 and css
Merge branch 'front' of https://github.com/Sassafrass6/cs373-idb into front