add test folders
write sign_up test
fix merge conflicts
change test
john fixed CSS
things