Initial commit
Adding license
Resolving merge conflict