Merge branch 'stage', remote-tracking branch 'origin'
Merge branch 'master' of heroku.com:white-sparrow
updated info