fixed typos on random function
added preview image and styling to trending
Merge branch 'master' of https://github.com/dscx/GetGif
fixed typo in for loop
generate new token
added a load more function to main
Merge branch 'master' of https://github.com/dscx/GetGif

Conflicts:
	gif/app/scripts/controllers/main.js
Merge branch 'master' of https://github.com/dscx/GetGif

Conflicts:
	gif/app/scripts/controllers/main.js