added API authentication logic
Merge branch 'master' of https://github.com/dscx/GetGif
pre azure
change order of env variables
change order of env variables
Merge branch 'master' of https://github.com/dscx/GetGif
hide env var
azure troubleshooting
azure troubleshooting
azure troubleshooting
azure troubleshooting
azure troubleshooting
azure troubleshooting
azure troubleshooting
azure troubleshooting
Merge branch 'master' of https://github.com/dscx/GetGif

Conflicts:
	gif/app/scripts/controllers/trending.js
changed opacity on trending
Merge pull request #10 from caseyg1204/master

deployed to azure