Adding readme.md and initial file
Adding license and resolving merge conflict