merge main.scala.html
beginning of interface work\!