sync
Merge branch 'master' of https://github.com/jackflips/Protest

Conflicts:
	MCTest/ConnectionManager.m