Initial commit
Merge with github default setup