Set tile position on the scroll view
Merge branch 'master' of https://github.com/afarber/ios-newbie

Conflicts:
	ScrollContent/ScrollContent/ViewController.m