Pa_pass
Merge remote-tracking branch 'coursera/master'

Conflicts:
	.gitignore