added login button for sign up page
resolved merge conflicts in FlatironVideo
finished login button for signup page