y
Merge remote-tracking branch 'origin/master'

Conflicts:
	BeautifulServer/BeautifulServer/bin/Debug/log20141008.txt