about page
Merge pull request #390 from Kae7in/david-search

David search
changes on live site
add search to navbar
Merge pull request #395 from Kae7in/navbar_search

add search to navbar
Update about.html
add search and or tabs
Merge pull request #397 from Kae7in/separate_and_or_search

add search and or tabs
added titles to icons/links on splash page (index.html)
fix #398 search in navbar on enter
Merge pull request #399 from Kae7in/search_on_enter

fix #398 search in navbar on enter
added functioning search bar to splash page and removed search glyphicon from the navbar
Merge pull request #402 from Kae7in/k-splash-search

added functioning search bar to splash page and removed search glyphicon...
initial working of twistory api
api example working
Merge pull request #405 from Kae7in/angela-api

Angela api
updated db backup
Merge branch 'master' of github.com:Kae7in/cs373-idb
Merge branch 'master' of github.com:Kae7in/cs373-idb into david-search