Initial commit
Resolved conflict between license