3 row
Merge branch 'master' of https://github.com/sonnguyen1187/firstGIT

Conflicts:
	FirstGIT/FirstGIT/DemoAppDelegate.m