s
Merge remote-tracking branch 'github/master'

Conflicts:
	.DS_Store
2013-7-13
2013-7-13