Initial commit
Merge remote-tracking branch 'origin/master'
Updated .gitignore conflicts.

Conflicts:
	.gitignore