Merge branch 'develop'
* added redirect if heroku production server loads instead of www.<appname>.com
* added redirect if heroku production server loads instead of www.<appname>.com
* added redirect if heroku production server loads instead of www.<appname>.com
* trying to get conditional redirect to work...
* trying to get conditional redirect to work...
* trying to get conditional redirect to work...
* updated with  new code from https://github.com/startup-class/bitstarter-leaderboard.
Merge branch 'staging'

Conflicts:
	web.js