Initial commit
Fixing license and readme.md conflicts
Adding license and readme.md changes back in