Initial commit
Conflict: readme (solved)