landing page haml
tambah logo
fix conflict
dashboard
fix conflict