Add initial development files
merging local and remote branches