twitter polls every 15 minutes
Merge branch 'master' of https://github.com/dscx/GetGif

Conflicts:
	gif/app/views/trending.html
resolved trending conflict
Merge pull request #6 from caseyg1204/master

fixed merge issues