Continued with infinity scroll, issue #67
Merge branch 'master' of https://github.com/ukupat/linkrepo

Conflicts:
	public/javascripts/main.js