Initial commit.
conflicts in .gitignore removed