Initial commit.
Resolved conflict. Used github.com's .gitignore instead.