bugfix: fixes overlapping articles issue

fixes #12
Merge branch 'master' of github.com:GrinnellAppDev/SandB-iOS into ui-redesign

Conflicts:
	SandB-iOS/SandB-iOS/ArticleViewController.m
Pulling in the Inifinite Scrollview stuff