Create README.md
Fixed conflict.
Added viikko2 to master.