Initial commit.
Merge origin/master
Added .gitignore file.