full
updated project.css and buttons.css
fixed merge errors :)