Initial commit.
Updated .gitignore
Merging with origin