info page finished(merge from heroku master