Merge branch 'master' of github.com:austinfitzpatrick/AJFCollectionViewWaterfallLayout

Conflicts:
	Example/AJFCollectionViewWaterfallLayout/AJFViewController.m
Merge branch 'master' of github.com:austinfitzpatrick/AJFCollectionViewWaterfallLayout