Set up most of the basic necessities. MVC works. Installed fonts. Working on the standard layout generator 'layout.scala.html'. Gonna try connecting to a database and see what happens.
Merge conflict resolved; strange reason. Should be good now