Merge pull request #5 from luismfonseca/scaffold-101

Scaffold 101
Merge branch 'master' of github.com:luismfonseca/agile-scala-android