updated files
updated stylesheet2.css to fix conflict
theresa's updated files