Started on Scala
Merge remote-tracking branch 'dbousarma/master' into adding_scala

Conflicts:
	scala.html.markdown