Initial commit
Resolved license conflict.