First commit and app skeleton
Merge