first version
Merge remote-tracking branch 'yahoo/master'

Conflicts:
	.gitignore