Initial check-in
Merge conflicts with readme.md and license