Initial commit.
Conflicts were fixed