edited adam, created seth
updated index and routes
fixed merge conflicts
mad changes
resolved merge conflicts