changed styles format and did stuff w backbone
merge conflicts