Initial commit.
Add .gitignore to repository.
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	.gitignore