stuff and things
anbsdkjgbkjasdgbkjMerge branch 'master' of https://github.com/justinryder/InfiniteScroller

Conflicts:
	AngularScroller/app/partials/game.html