Initial Commit
fixed merge conflict with generated readme and added license