Initial commit.
Conflicts in .gitigonre resolved.