1
jj
Merge branch 'master' of https://github.com/heroalur/ChatFrog

Conflicts:
	Code/ChatFrog/ChatFrog.xcodeproj/project.pbxproj
	Code/ChatFrog/ChatFrog/Macro.h