added borders when coplliding for debugging
Merge branch 'master' of https://github.com/justinryder/InfiniteScroller
fixed collision detection
Merge branch 'master' of https://github.com/justinryder/InfiniteScroller

Conflicts:
	AngularScroller/app/js/controllers.js