20.12
Merge branch 'master' of https://github.com/Artwalk/Practice_iOS

Conflicts:
	iOS 7 Programming Cookbook/20.11.Moving Shapes/20.11.Moving Shapes/view.m