Initial files and application
Merge origin/master