Remove conflict markers (and the conflict itself)
Add license
Add ignored files
Merge branch 'master' into sqlstorage