Merge branch 'master' of https://github.com/dscx/GetGif
handle over rate limit
Merge branch 'master' of https://github.com/dscx/GetGif
Merge branch 'master' of https://github.com/dscx/GetGif
generate new token
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
Merge pull request #9 from caseyg1204/master

merge