1.5

instafeed.js loadmore
Merge branch 'master' of https://github.com/vanessaliu/ChensFED

Conflicts:
	terminsprojektKod/js/scripts.js