sdfasdfas
got rid of merge conflicts
got rid of .proj:hover css attr