added controller actions
added css
added a button
fixed merge conflicts
added forms, styling and some stuff
lots index conflict merged
clearing conflict
clearing econd conflict