First merge of the sample app

Have a look at the first merge of the app