add .gitignore
Merge branch 'master' of github.com:DancoAndroidAppDev/Homework4

Conflicts:
	.gitignore
Merge branch 'master' of github.com:DancoAndroidAppDev/Homework4
Merge branch 'master' of github.com:DancoAndroidAppDev/Homework4
check-in SquareLayout sample