Ignore
Merge branch 'master'

Conflicts:
	.gitignore