commiting the whole demo app
merging