edited login and signup pages, changed home page text, worked on favorites button
resolved merge conflict in markets show page