scala version
Merge branch '01template' of https://github.com/iturrioz/ScalaAcademyAndroid into 02tests
Merge branch '02tests' of https://github.com/iturrioz/ScalaAcademyAndroid into 03traits