Merge the working branch

First version of the app