1
Merge branch 'master' of https://github.com/maksbu/Development

Conflicts:
	Calc/Calc/Calc-Info.plist
	Calc/Calc/Calc-Prefix.pch
	Calc/Calc/en.lproj/InfoPlist.strings
	SandBox/SandBox.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	objCBox/objCBox.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	ping-pong/ping-pong/PPAppDelegate.h
	ping-pong/ping-pong/PPAppDelegate.m
	ping-pong/ping-pong/main.m
	terminalBox/terminalBox.xcodeproj/project.pbxproj

terminalBox/terminalBox.xcodeproj/project.xcworkspace/contents.xcworkspa
cedata
	terminalBox/terminalBox/main.c