READ THE README SECTION "First-time Setup"!
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore