fixed the csv file
starting the search page
starting the search page
starting the search page
starting the search page
Merge branch 'master' of https://github.com/jbernie2/csc210final into Joseph
Merge branch 'Joseph' of https://github.com/jbernie2/csc210final into Joseph
starting the search page
Merge branch 'Joseph' of https://github.com/jbernie2/csc210final into Joseph
testing time
Merge branch 'master' of https://github.com/jbernie2/csc210final
Merge branch 'john'
added some alerts
javascript is a cruel mistress
javascript is a cruel, cruel mistres
Merge branch 'master' of https://github.com/jbernie2/csc210final
logout and login working.... i think
Merge branch 'master' of https://github.com/jbernie2/csc210final into john
search results spit into table
Merge branch 'Joseph'