more
fix merge
add css, html, controller, view, and favicon rm