Initial commit
Create README.md
Master before merge
Merge solved conflicts
Finished example