Finish demo app
first commit
Fixed