introduced asl 
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/ApplicationController.scala
	app/views/mainPage.scala.html
added asl