Boilerplate commit
Merged local and master

Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore